yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/oa/BpmOARefundApi.java

@@ -1,33 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.oa;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.bpm.api.oa.vo.BpmOARefundDTO;
-import cn.iocoder.yudao.module.bpm.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 退款申请")
-public interface BpmOARefundApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/oa/refund";
-
-    @PostMapping(PREFIX + "/get")
-    @Operation(summary = "获得指定的退款申请列表")
-    CommonResult<Map<String,BpmOARefundDTO>> getListByOrderNo(@RequestBody List<String> orderNos);
-
-    @GetMapping(PREFIX + "/update-status")
-    @Operation(summary = "修改退款申请的退款状态 为已退款")
-    @Parameter(name = "orderNo", description = "订单编号", required = true)
-    @Parameter(name = "status", description = "状态", required = true)
-    CommonResult<Boolean> updateStatus(@RequestParam("orderNo") String orderNo);
-}

yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/api/oa/vo/BpmOARefundDTO.java

@@ -1,50 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.oa.vo;
-
-import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-
-/**
- * @author 符溶馨
- */
-@Schema(description = "管理后台 - 退款申请  请求Request VO")
-@Data
-@ToString(callSuper = true)
-public class BpmOARefundDTO {
-
-    @Schema(description = "表单主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Long id;
-
-    @Schema(description = "状态-参见 bpm_process_instance_result 枚举", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer result;
-
-    @Schema(description = "流程id")
-    private String processInstanceId;
-
-    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    private String orderNo;
-
-    @Schema(description = "扣款金额")
-    private BigDecimal chargebacksAmount;
-
-    @Schema(description = "退款金额", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    private BigDecimal refundAmount;
-
-    @Schema(description = "退款日期", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate refundDate;
-
-    @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
-    private String notes;
-
-    @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
-    private List<UploadUserFile> fileItems;
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/api/oa/BpmOARefundApiImpl.java

@@ -1,39 +0,0 @@
-package cn.iocoder.yudao.module.bpm.api.oa;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.api.oa.vo.BpmOARefundDTO;
-import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARefundDO;
-import cn.iocoder.yudao.module.bpm.service.oa.BpmOARefundService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertMap;
-
-/**
- * Flowable 流程实例 Api 实现类
- */
-@RestController
-@Validated
-public class BpmOARefundApiImpl implements BpmOARefundApi{
-
-    @Resource
-    private BpmOARefundService refundService;
-
-    @Override
-    public CommonResult<Map<String, BpmOARefundDTO>> getListByOrderNo(List<String> orderNos) {
-        List<BpmOARefundDO> list = refundService.getListByOrderNo(orderNos);
-        return success(convertMap(BeanUtils.toBean(list, BpmOARefundDTO.class), BpmOARefundDTO::getOrderNo));
-    }
-
-    @Override
-    public CommonResult<Boolean> updateStatus(String orderNo) {
-        refundService.updateStatus(orderNo);
-        return success(true);
-    }
-}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/refund/BpmOARefundCreateReqVO.java

@@ -47,9 +47,6 @@ public class BpmOARefundCreateReqVO {
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String notes;
 
-    @Schema(description = "状态 | 0未退款 1已退款", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer status;
-
     @Schema(description = "流程实例编号")
     private String processInstanceId;
 

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/refund/BpmOARefundRespVO.java

@@ -46,9 +46,6 @@ public class BpmOARefundRespVO extends BpmOABaseRespVO {
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private String notes;
 
-    @Schema(description = "状态 | 0未退款 1已退款", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer status;
-
     @Schema(description = "上传文件", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<UploadUserFile> fileItems;
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/dataobject/oa/BpmOARefundDO.java

@@ -71,11 +71,6 @@ public class BpmOARefundDO extends BaseDO {
      */
     private String notes;
 
-    /**
-     * 状态 | 0未退款 1已退款
-     */
-    private Integer status;
-
     /**
      * 结果
      * 枚举 {@link BpmProcessInstanceResultEnum}

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/oa/BpmOAEvectionMapper.java

@@ -4,11 +4,8 @@ import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.evection.BpmOAEvectionCreateReqVO;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOAEvectionDO;
-import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.Arrays;
-
 /**
  * 出差申请 Mapper
  *
@@ -23,7 +20,6 @@ public interface BpmOAEvectionMapper extends BaseMapperX<BpmOAEvectionDO> {
         return selectCount(new LambdaQueryWrapperX<BpmOAEvectionDO>()
                 .eq(BpmOAEvectionDO::getUserId, userId)
                 .leIfPresent(BpmOAEvectionDO::getStartTime, createReqVO.getEndTime())
-                .geIfPresent(BpmOAEvectionDO::getEndTime, createReqVO.getStartTime())
+                .geIfPresent(BpmOAEvectionDO::getEndTime, createReqVO.getStartTime()));
-                .in(BpmOAEvectionDO::getResult, Arrays.asList(BpmProcessInstanceResultEnum.PROCESS, BpmProcessInstanceResultEnum.APPROVE)));
     }
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/rpc/config/RpcConfiguration.java

@@ -18,7 +18,6 @@ import cn.iocoder.yudao.module.system.api.permission.RoleApi;
 import cn.iocoder.yudao.module.system.api.position.PositionApi;
 import cn.iocoder.yudao.module.system.api.project.ProjectApi;
 import cn.iocoder.yudao.module.system.api.rental.RentalDepositRecordApi;
-import cn.iocoder.yudao.module.system.api.rental.RentalItemsRecordApi;
 import cn.iocoder.yudao.module.system.api.rental.RentalOrderApi;
 import cn.iocoder.yudao.module.system.api.sms.SmsSendApi;
 import cn.iocoder.yudao.module.system.api.social.SocialClientApi;
@@ -33,7 +32,7 @@ import org.springframework.context.annotation.Configuration;
 @EnableFeignClients(clients = {FileApi.class, RoleApi.class, DeptApi.class, PostApi.class, AdminUserApi.class, SmsSendApi.class, DictDataApi.class, NotifyMessageSendApi.class,
         SubscribeMessageSendApi.class, SocialClientApi.class, UsersExtApi.class, AttendanceApi.class, BankApi.class, ConfigApi.class, PositionApi.class, SupplierApi.class, AssetsApi.class,
         AssetsTypeApi.class, AssetReceiveApi.class, AttendanceApi.class, AttendanceGroupApi.class, WorkOvertimeApi.class, HolidayApi.class,
-        RentalOrderApi.class, RentalDepositRecordApi.class, ProjectApi.class, RentalItemsRecordApi.class
+        RentalOrderApi.class, RentalDepositRecordApi.class, ProjectApi.class
 })
 public class RpcConfiguration {
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARefundService.java

@@ -4,12 +4,11 @@ import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.refund.BpmOARefundCrea
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARefundDO;
 
 import javax.validation.Valid;
-import java.util.List;
 
 public interface BpmOARefundService {
 
     /**
-     * 创建退款申请
+     * 创建转正申请
      *
      * @param userId 用户编号
      * @param createReqVO 创建信息
@@ -18,7 +17,7 @@ public interface BpmOARefundService {
     Long createRefund(Long userId, @Valid BpmOARefundCreateReqVO createReqVO);
 
     /**
-     * 更新退款申请的状态
+     * 更新转正申请的状态
      *
      * @param id 编号
      * @param result 结果
@@ -26,30 +25,17 @@ public interface BpmOARefundService {
     void updateRefundResult(String processInstanceId, Long id, Integer result);
 
     /**
-     * 获得退款申请
+     * 获得转正申请
      *
      * @param id 编号
-     * @return 退款申请
+     * @return 转正申请
      */
     BpmOARefundDO getRefund(Long id);
 
     /**
-     * 获得指定的退款申请
+     * 获得指定的转正申请
      * @param processInstanceId 流程实例编号
-     * @return 退款申请
+     * @return 转正申请
      */
     BpmOARefundDO getByProcessInstanceId(String processInstanceId);
-
-    /**
-     * 获得指定的退款申请列表
-     * @param orderNos 订单编号
-     * @return 退款申请列表
-     */
-    List<BpmOARefundDO> getListByOrderNo(List<String> orderNos);
-
-    /**
-     * 更新退款申请状态
-     * @param orderNo 订单编号
-     */
-    void updateStatus(String orderNo);
 }

yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/BpmOARefundServiceImpl.java

@@ -1,24 +1,18 @@
 package cn.iocoder.yudao.module.bpm.service.oa;
 
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
 import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
 import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.refund.BpmOARefundCreateReqVO;
-import cn.iocoder.yudao.module.bpm.controller.admin.oa.vo.refund.BpmOARefundItems;
 import cn.iocoder.yudao.module.bpm.dal.dataobject.oa.BpmOARefundDO;
 import cn.iocoder.yudao.module.bpm.dal.mysql.oa.BpmOARefundMapper;
 import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
 import cn.iocoder.yudao.module.bpm.service.task.BpmHistoryProcessInstanceService;
 import cn.iocoder.yudao.module.bpm.service.task.BpmProcessInstanceService;
 import cn.iocoder.yudao.module.system.api.rental.RentalDepositRecordApi;
-import cn.iocoder.yudao.module.system.api.rental.RentalItemsRecordApi;
 import cn.iocoder.yudao.module.system.api.rental.RentalOrderApi;
-import cn.iocoder.yudao.module.system.api.rental.dto.RentalItemsRecordDTO;
 import cn.iocoder.yudao.module.system.api.rental.dto.RentalOrderDTO;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import org.flowable.engine.runtime.ProcessInstance;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
@@ -28,7 +22,6 @@ import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.OA_REFUND_NOT_EXISTS;
@@ -64,16 +57,13 @@ public class BpmOARefundServiceImpl extends BpmOABaseService implements BpmOARef
     @Resource
     private RentalOrderApi rentalOrderApi;
 
-    @Resource
-    private RentalItemsRecordApi rentalItemsRecordApi;
-
     @Resource
     private RentalDepositRecordApi depositRecordApi;
 
     @Override
     public Long createRefund(Long userId, BpmOARefundCreateReqVO createReqVO) {
 
-        // 发起流程前 校验扣款金额+退款金额是否大于已收金额
+        // 发起流程前 校验扣款金额+退款金额是否等于已收金额
         validateRefundAmount(createReqVO.getOrderNo(), createReqVO.getChargebacksAmount(), createReqVO.getRefundAmount());
 
         //插入OA 退款申请
@@ -112,16 +102,12 @@ public class BpmOARefundServiceImpl extends BpmOABaseService implements BpmOARef
     }
 
     /**
-     * 校验扣款金额+退款金额是否大于已收金额
+     * 校验扣款金额+退款金额是否等于已收金额
      */
     private void validateRefundAmount(String orderNo, BigDecimal chargebacksAmount, BigDecimal refundAmount) {
 
-        // 获取订单的已收金额 和 已退金额
+        BigDecimal recordAmount = depositRecordApi.getRecordAmount(orderNo).getCheckedData();
-        Map<String, BigDecimal> respVO = depositRecordApi.getRecordAmount(orderNo).getCheckedData();
+        if (recordAmount.compareTo(chargebacksAmount.add(refundAmount)) != 0) {
-        // 获取当前订单 还需退款金额 = 已收金额 - 已退金额
-        BigDecimal recordAmount = respVO.get("receivedAmount").subtract(respVO.get("refundAmount"));
-
-        if (recordAmount.compareTo(chargebacksAmount.add(refundAmount)) < 0) {
             throw exception(RENTAL_REFUND_AMOUNT_EXCESS);
         }
     }
@@ -137,30 +123,11 @@ public class BpmOARefundServiceImpl extends BpmOABaseService implements BpmOARef
 
             if (instance.isEnded()) {
 
-                // 获取订单的扣款金额
-                BigDecimal chargebacks = rentalOrderApi.getOrder(refundDO.getOrderNo()).getCheckedData().getChargebacksAmount();
-
                 // 审批通过后 更新租赁订单信息
                 rentalOrderApi.updateOrder(new RentalOrderDTO()
                         .setOrderNo(refundDO.getOrderNo())
-                        .setChargebacksAmount(refundDO.getChargebacksAmount().add(chargebacks))  // 扣款金额累加
+                        .setChargebacksAmount(refundDO.getChargebacksAmount())
                         .setStatus(3)); // 状态变更为 等待退款中
-
-                List<BpmOARefundItems> items = refundDO.getRefundItems();
-                //直接从数据库取出来的List<Reimbursement> 实际上是List<LinkedHashMap>类型 所以不能直接遍历
-                //将list再次转为json串，然后由json串再转为list
-                String json = JsonUtils.toJsonString(items);
-                items = JsonUtils.parseArray(json, BpmOARefundItems.class);
-
-                // 审批通过后 更新租赁物品 归还信息
-                List<RentalItemsRecordDTO> createReqVO = items.stream()
-                        .map(item -> new RentalItemsRecordDTO()
-                                .setOrderNo(refundDO.getOrderNo())
-                                .setRentalItemsType(item.getRentalItemsType())
-                                .setNumber(item.getRentalNumber())
-                                .setType(2))
-                        .collect(Collectors.toList());
-                rentalItemsRecordApi.create(createReqVO);
             }
         }
 
@@ -198,19 +165,4 @@ public class BpmOARefundServiceImpl extends BpmOABaseService implements BpmOARef
 
         return refundMapper.selectOne(BpmOARefundDO::getProcessInstanceId, processInstanceId);
     }
-
-    @Override
-    public List<BpmOARefundDO> getListByOrderNo(List<String> orderNos) {
-        return refundMapper.selectList(new LambdaQueryWrapperX<BpmOARefundDO>()
-                .inIfPresent(BpmOARefundDO::getOrderNo, orderNos)
-                .eq(BpmOARefundDO::getStatus, 0));
-    }
-
-    @Override
-    public void updateStatus(String orderNo) {
-        refundMapper.update(null, new LambdaUpdateWrapper<BpmOARefundDO>()
-                .set(BpmOARefundDO::getStatus, 1)
-                .eq(BpmOARefundDO::getOrderNo, orderNo)
-                .eq(BpmOARefundDO::getStatus, 0));
-    }
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalDepositRecordApi.java

@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.math.BigDecimal;
-import java.util.Map;
 
 @FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
 @Tag(name = "RPC 服务 - 租赁订单金额记录")
@@ -26,5 +25,5 @@ public interface RentalDepositRecordApi {
 
     @GetMapping(PREFIX + "/getRecordAmount")
     @Operation(summary = "获取租赁订单已收取的金额")
-    CommonResult<Map<String, BigDecimal>> getRecordAmount(@RequestParam("orderNo") String orderNo);
+    CommonResult<BigDecimal> getRecordAmount(@RequestParam("orderNo") String orderNo);
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalItemsRecordApi.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.api.rental;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.module.system.api.rental.dto.RentalDepositRecordDTO;
-import cn.iocoder.yudao.module.system.api.rental.dto.RentalItemsRecordDTO;
-import cn.iocoder.yudao.module.system.enums.ApiConstants;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@FeignClient(name = ApiConstants.NAME) // TODO 芋艿：fallbackFactory =
-@Tag(name = "RPC 服务 - 租赁订单物品记录")
-public interface RentalItemsRecordApi {
-
-    String PREFIX = ApiConstants.PREFIX + "/rental-items";
-
-    @PutMapping(PREFIX + "/create")
-    @Operation(summary = "创建租赁订单出入库记录")
-    CommonResult<Boolean> create(@RequestBody List<RentalItemsRecordDTO> createReqVO);
-}

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalOrderApi.java

@@ -22,9 +22,4 @@ public interface RentalOrderApi {
     @PutMapping(PREFIX + "/update")
     @Operation(summary = "更新租赁订单信息")
     CommonResult<Boolean> updateOrder(@RequestBody RentalOrderDTO updateReqVO);
-
-    @GetMapping(PREFIX + "/get")
-    @Operation(summary = "获取租赁订单信息")
-    @Parameter(name = "orderNo", description = "订单编号", required = true)
-    CommonResult<RentalOrderDTO> getOrder(@RequestParam("orderNo") String orderNo);
 }

yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/rental/dto/RentalItemsRecordDTO.java

@@ -1,32 +0,0 @@
-package cn.iocoder.yudao.module.system.api.rental.dto;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-@Schema(description = "管理后台 - 租赁物品记录新增/修改 Request VO")
-@Data
-public class RentalItemsRecordDTO {
-
-    @Schema(description = "租赁订单表单主键")
-    private Long id;
-
-    @Schema(description = "订单编号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotEmpty(message = "订单编号不能为空")
-    private String orderNo;
-
-    @Schema(description = "租赁物品种类 | 字典值参考 system_rental_items_type", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "租赁物品种类不能为空")
-    private Integer rentalItemsType;
-
-    @Schema(description = "租赁数量", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "租赁数量不能为空")
-    private Integer number;
-
-    @Schema(description = "类型 | 1租借 2归还", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "类型不能为空")
-    private Integer type;
-
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalDepositRecordApiImpl.java

@@ -3,16 +3,19 @@ package cn.iocoder.yudao.module.system.api.rental;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.api.rental.dto.RentalDepositRecordDTO;
+import cn.iocoder.yudao.module.system.api.rental.dto.RentalOrderDTO;
+import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderSaveReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.rentaldepositrecord.RentalDepositAmountReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.rentaldepositrecord.RentalDepositRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalDepositRecordDO;
 import cn.iocoder.yudao.module.system.service.rental.RentalDepositRecordService;
+import cn.iocoder.yudao.module.system.service.rental.RentalOrderService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+
 import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
@@ -30,11 +33,8 @@ public class RentalDepositRecordApiImpl implements RentalDepositRecordApi {
     }
 
     @Override
-    public CommonResult<Map<String, BigDecimal>> getRecordAmount(String orderNo) {
+    public CommonResult<BigDecimal> getRecordAmount(String orderNo) {
         RentalDepositAmountReqVO reqVO = rentalDepositRecordService.getRentalDepositRecordAmount(orderNo, false);
-        Map<String, BigDecimal> result = new HashMap<>();
+        return success(reqVO.getReceivedAmount());
-        result.put("receivedAmount", reqVO.getReceivedAmount());
-        result.put("refundAmount", reqVO.getRefundAmount());
-        return success(result);
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalItemsRecordApiImpl.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.module.system.api.rental;
-
-import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.system.api.rental.dto.RentalItemsRecordDTO;
-import cn.iocoder.yudao.module.system.controller.admin.rental.vo.itemsrecord.RentalItemsRecordSaveReqVO;
-import cn.iocoder.yudao.module.system.service.rental.RentalItemsRecordService;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
-@RestController // 提供 RESTful API 接口，给 Feign 调用
-@Validated
-public class RentalItemsRecordApiImpl implements RentalItemsRecordApi {
-
-    @Resource
-    private RentalItemsRecordService rentalItemsRecordService;
-
-    @Override
-    public CommonResult<Boolean> create(List<RentalItemsRecordDTO> createReqVO) {
-        rentalItemsRecordService.createRentalItemsRecordBath(BeanUtils.toBean(createReqVO, RentalItemsRecordSaveReqVO.class));
-        return success(true);
-    }
-}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalOrderApiImpl.java

@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.system.api.rental;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.api.rental.dto.RentalOrderDTO;
-import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalOrderDO;
+import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderSaveReqVO;
 import cn.iocoder.yudao.module.system.service.rental.RentalOrderService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RestController;
@@ -21,13 +21,7 @@ public class RentalOrderApiImpl implements RentalOrderApi {
 
     @Override
     public CommonResult<Boolean> updateOrder(RentalOrderDTO updateReqVO) {
-        rentalOrderService.update(BeanUtils.toBean(updateReqVO, RentalOrderDO.class));
+        rentalOrderService.update(BeanUtils.toBean(updateReqVO, RentalOrderSaveReqVO.class));
         return success(true);
     }
-
-    @Override
-    public CommonResult<RentalOrderDTO> getOrder(String orderNo) {
-        RentalOrderDO rentalOrder = rentalOrderService.getRentalOrder(orderNo);
-        return success(BeanUtils.toBean(rentalOrder, RentalOrderDTO.class));
-    }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/RentalOrderController.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.rental;
 
-import cn.hutool.core.collection.CollectionUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.api.oa.BpmOARefundApi;
+import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.module.bpm.api.oa.vo.BpmOARefundDTO;
+import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderSaveReqVO;
@@ -23,14 +23,14 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 
 @Tag(name = "管理后台 - 租赁订单")
@@ -48,9 +48,6 @@ public class RentalOrderController {
     @Resource
     private RentalDepositRecordService rentalDepositRecordService;
 
-    @Resource
-    private BpmOARefundApi refundApi;
-
     @PostMapping("/create")
     @Operation(summary = "创建租赁订单")
     @PreAuthorize("@ss.hasPermission('system:rental-order:create')")
@@ -106,22 +103,6 @@ public class RentalOrderController {
     @PreAuthorize("@ss.hasPermission('system:rental-order:query')")
     public CommonResult<PageResult<RentalOrderRespVO>> getRentalOrderPage(@Valid RentalOrderPageReqVO pageReqVO) {
         PageResult<RentalOrderRespVO> pageResult = rentalOrderService.getRentalOrderPage(pageReqVO);
-        // 获取等待退款的订单号
-        List<String> orderNos = pageResult.getList().stream()
-                .filter(item -> Objects.equals(item.getStatus(), RentalOrderDO.WAITING_FOR_REFUND))
-                .map(RentalOrderRespVO::getOrderNo)
-                .collect(Collectors.toList());
-        // 获取订单号对应的退款申请
-        Map<String, BpmOARefundDTO> refundMap = refundApi.getListByOrderNo(orderNos).getCheckedData();
-
-        if (CollectionUtil.isNotEmpty(refundMap)) {
-            // 设置对应的订单号中的 申请退款和扣款金额
-            pageResult.getList().forEach(item -> {
-                item.setApplyRefundAmount(refundMap.get(item.getOrderNo()).getRefundAmount());
-                item.setApplyChargebacksAmount(refundMap.get(item.getOrderNo()).getChargebacksAmount());
-            });
-        }
-
         return success(pageResult);
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/vo/order/RentalOrderRespVO.java

@@ -43,12 +43,6 @@ public class RentalOrderRespVO {
     @Schema(description = "扣款金额")
     private BigDecimal chargebacksAmount;
 
-    @Schema(description = "申请退款金额")
-    private BigDecimal applyRefundAmount;
-
-    @Schema(description = "申请扣款金额")
-    private BigDecimal applyChargebacksAmount;
-
     @Schema(description = "备注")
     private String notes;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/rental/vo/rentaldepositrecord/RentalDepositRecordSaveReqVO.java

@@ -40,9 +40,6 @@ public class RentalDepositRecordSaveReqVO {
     @NotNull(message = "收款/退款金额不能为空")
     private BigDecimal amount;
 
-    @Schema(description = "扣款金额")
-    private BigDecimal chargebacksAmount;
-
     @Schema(description = "收款/退款日期", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "收款/退款日期不能为空")
     private LocalDate paymentDate;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/rental/RentalOrderDO.java

@@ -1,11 +1,13 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.rental;
 
-import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.*;
 
 import java.math.BigDecimal;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 租赁订单 DO
@@ -21,23 +23,6 @@ import java.math.BigDecimal;
 @AllArgsConstructor
 public class RentalOrderDO extends BaseDO {
 
-    /**
-     * 状态 1 租赁中
-     */
-    public static final Integer ON_LEASE = 1;
-    /**
-     * 状态 2 退款申请中
-     */
-    public static final Integer REFUND_REQUESTED = 2;
-    /**
-     * 状态 3 等待退款中
-     */
-    public static final Integer WAITING_FOR_REFUND = 3;
-    /**
-     * 状态 4 已退款
-     */
-    public static final Integer REFUNDED = 4;
-
     /**
      * 租赁订单表单主键
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/rpc/config/RpcConfiguration.java

@@ -1,7 +1,10 @@
 package cn.iocoder.yudao.module.system.framework.rpc.config;
 
 import cn.iocoder.yudao.module.bpm.api.model.BpmModelApi;
-import cn.iocoder.yudao.module.bpm.api.oa.*;
+import cn.iocoder.yudao.module.bpm.api.oa.BpmOAEntryApi;
+import cn.iocoder.yudao.module.bpm.api.oa.BpmOAEvectionApi;
+import cn.iocoder.yudao.module.bpm.api.oa.BpmOAGoOutApi;
+import cn.iocoder.yudao.module.bpm.api.oa.BpmOAReplacementCardApi;
 import cn.iocoder.yudao.module.infra.api.config.ConfigApi;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
@@ -11,6 +14,6 @@ import org.springframework.context.annotation.Configuration;
 
 @Configuration(proxyBeanMethods = false)
 @EnableFeignClients(clients = {FileApi.class, WebSocketSenderApi.class, FactoryInfoApi.class, BpmModelApi.class, BpmOAGoOutApi.class, BpmOAEntryApi.class, ConfigApi.class,
-        BpmOAEvectionApi.class, BpmOAReplacementCardApi.class, BpmOARefundApi.class})
+        BpmOAEvectionApi.class, BpmOAReplacementCardApi.class})
 public class RpcConfiguration {
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/rental/RentalDepositRecordServiceImpl.java

@@ -3,17 +3,14 @@ package cn.iocoder.yudao.module.system.service.rental;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.pojo.UploadUserFile;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.api.oa.BpmOARefundApi;
 import cn.iocoder.yudao.module.infra.api.file.FileApi;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.rentaldepositrecord.RentalDepositAmountReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.rentaldepositrecord.RentalDepositRecordPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.rentaldepositrecord.RentalDepositRecordSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalDepositRecordDO;
-import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalOrderDO;
 import cn.iocoder.yudao.module.system.dal.mysql.rental.RentalDepositRecordMapper;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -43,11 +40,7 @@ public class RentalDepositRecordServiceImpl implements RentalDepositRecordServic
     @Resource
     private FileApi fileApi;
 
-    @Resource
-    private BpmOARefundApi refundApi;
-
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public Long createRentalDepositRecord(RentalDepositRecordSaveReqVO createReqVO) {
 
         // 获取当前订单的 剩余押金金额
@@ -67,25 +60,11 @@ public class RentalDepositRecordServiceImpl implements RentalDepositRecordServic
                 }
                 break;
             case 2:
-                RentalOrderDO updateOrder = new RentalOrderDO();
                 // 押金退款
-                // 判断当前退款金额 + 扣款金额 大于 剩余已收金额时
+                // 判断当前退款金额 大于 实际已收的金额时
-                BigDecimal refundAmount = createReqVO.getAmount().add(createReqVO.getChargebacksAmount() == null ? BigDecimal.ZERO : createReqVO.getChargebacksAmount());
+                if (amount.compareTo(createReqVO.getAmount()) < 0) {
-                if (amount.compareTo(refundAmount) < 0) {
                     throw exception(RENTAL_REFUND_AMOUNT_EXCESS);
-                } else if (amount.compareTo(refundAmount) == 0) { // 判断当前退款金额 是否等于 实际已收的金额 - 扣款金额时
-                    // 更新订单状态为 已退款
-                    updateOrder.setOrderNo(createReqVO.getOrderNo());
-                    updateOrder.setStatus(RentalOrderDO.REFUNDED);
-                }else { // 判断当前退款金额 是否小于 实际已收的金额 - 扣款金额时
-                    // 更新订单状态为 租赁中
-                    updateOrder.setOrderNo(createReqVO.getOrderNo());
-                    updateOrder.setStatus(RentalOrderDO.ON_LEASE);
                 }
-                // 同步更新 退款申请流程中的 退款状态
-                refundApi.updateStatus(createReqVO.getOrderNo());
-                // 同步更新 租赁订单状态
-                rentalOrderService.update(updateOrder);
                 break;
         }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/rental/RentalOrderService.java

@@ -35,7 +35,7 @@ public interface RentalOrderService {
      * 更新租赁订单
      * @param updateReqVO 更新信息
      */
-    void update(RentalOrderDO updateReqVO);
+    void update(RentalOrderSaveReqVO updateReqVO);
 
     /**
      * 删除租赁订单
@@ -52,14 +52,6 @@ public interface RentalOrderService {
      */
     RentalOrderDO getRentalOrder(Long id);
 
-    /**
-     * 获得租赁订单
-     *
-     * @param orderNo 订单编号
-     * @return 租赁订单
-     */
-    RentalOrderDO getRentalOrder(String orderNo);
-
     /**
      * 获得租赁订单分页
      *

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/rental/RentalOrderServiceImpl.java

@@ -10,6 +10,8 @@ import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrd
 import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalOrderDO;
 import cn.iocoder.yudao.module.system.dal.mysql.rental.RentalOrderMapper;
 import cn.iocoder.yudao.module.system.dal.redis.RedisKeyConstants;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -24,6 +26,7 @@ import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -116,14 +119,15 @@ public class RentalOrderServiceImpl implements RentalOrderService {
     }
 
     @Override
-    public void update(RentalOrderDO updateReqVO) {
+    public void update(RentalOrderSaveReqVO updateReqVO) {
         Long count = rentalOrderMapper.selectCount(RentalOrderDO::getOrderNo, updateReqVO.getOrderNo());
         if (count <= 0L) {
             throw exception(RENTAL_ORDER_NOT_EXISTS);
         }
 
         // 更新
-        rentalOrderMapper.update(updateReqVO, new LambdaQueryWrapperX<RentalOrderDO>()
+        RentalOrderDO updateObj = BeanUtils.toBean(updateReqVO, RentalOrderDO.class);
+        rentalOrderMapper.update(updateObj, new LambdaQueryWrapperX<RentalOrderDO>()
                 .eq(RentalOrderDO::getOrderNo, updateReqVO.getOrderNo()));
     }
 
@@ -143,16 +147,9 @@ public class RentalOrderServiceImpl implements RentalOrderService {
 
     @Override
     public RentalOrderDO getRentalOrder(Long id) {
-
         return rentalOrderMapper.selectById(id);
     }
 
-    @Override
-    public RentalOrderDO getRentalOrder(String orderNo) {
-
-        return rentalOrderMapper.selectOne(RentalOrderDO::getOrderNo, orderNo);
-    }
-
     @Override
     public PageResult<RentalOrderRespVO> getRentalOrderPage(RentalOrderPageReqVO pageReqVO) {
         return rentalOrderMapper.selectPage(pageReqVO);
@@ -161,7 +158,7 @@ public class RentalOrderServiceImpl implements RentalOrderService {
     @Override
     @Cacheable(value = RedisKeyConstants.RENTAL_ORDER_AMOUNT, key = "#orderNo", unless = "#result == null")
     public BigDecimal getOrderAmount(String orderNo) {
-
         return rentalOrderMapper.selectOrderAmount(orderNo);
     }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/rental/RentalItemsRecordMapper.xml

@@ -19,8 +19,6 @@
         WHERE
 	        order_no = #{orderNo}
             AND deleted = 0
-        GROUP BY
-            rental_items_type
         <if test="isUpdate">
             FOR UPDATE
         </if>