feat(rental): 完善租赁订单退款功能并新增相关接口

- 新增租赁订单物品记录相关接口和DTO
- 完善租赁订单状态管理和退款流程- 新增获取租赁订单信息接口
- 优化租赁订单列表展示，增加退款申请信息

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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,39 @@
+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,6 +47,9 @@ 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,6 +46,9 @@ 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,6 +71,11 @@ 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,8 +4,11 @@ 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
  *
@@ -20,6 +23,7 @@ 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,6 +18,7 @@ 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;
@@ -32,7 +33,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
+        RentalOrderApi.class, RentalDepositRecordApi.class, ProjectApi.class, RentalItemsRecordApi.class
 })
 public class RpcConfiguration {
 }

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

@@ -4,11 +4,12 @@ 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 创建信息
@@ -17,7 +18,7 @@ public interface BpmOARefundService {
     Long createRefund(Long userId, @Valid BpmOARefundCreateReqVO createReqVO);
 
     /**
-     * 更新转正申请的状态
+     * 更新退款申请的状态
      *
      * @param id 编号
      * @param result 结果
@@ -25,17 +26,30 @@ 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,18 +1,24 @@
 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;
@@ -22,6 +28,7 @@ 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;
@@ -57,13 +64,16 @@ 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 退款申请
@@ -102,12 +112,16 @@ public class BpmOARefundServiceImpl extends BpmOABaseService implements BpmOARef
     }
 
     /**
-     * 校验扣款金额+退款金额是否等于已收金额
+     * 校验扣款金额+退款金额是否大于已收金额
      */
     private void validateRefundAmount(String orderNo, BigDecimal chargebacksAmount, BigDecimal refundAmount) {
 
-        BigDecimal recordAmount = depositRecordApi.getRecordAmount(orderNo).getCheckedData();
+        // 获取订单的已收金额 和 已退金额
-        if (recordAmount.compareTo(chargebacksAmount.add(refundAmount)) != 0) {
+        Map<String, BigDecimal> respVO = depositRecordApi.getRecordAmount(orderNo).getCheckedData();
+        // 获取当前订单 还需退款金额 = 已收金额 - 已退金额
+        BigDecimal recordAmount = respVO.get("receivedAmount").subtract(respVO.get("refundAmount"));
+
+        if (recordAmount.compareTo(chargebacksAmount.add(refundAmount)) < 0) {
             throw exception(RENTAL_REFUND_AMOUNT_EXCESS);
         }
     }
@@ -123,11 +137,30 @@ 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())
+                        .setChargebacksAmount(refundDO.getChargebacksAmount().add(chargebacks))  // 扣款金额累加
                         .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);
             }
         }
 
@@ -165,4 +198,19 @@ 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-biz/src/main/java/cn/iocoder/yudao/module/system/api/rental/RentalDepositRecordApiImpl.java

@@ -3,18 +3,13 @@ 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;

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

@@ -2,21 +2,14 @@ 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.RentalItemsRecordDTO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.itemsrecord.RentalItemsRecordSaveReqVO;
-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.service.rental.RentalDepositRecordService;
 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.math.BigDecimal;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 

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

@@ -3,7 +3,6 @@ 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.controller.admin.rental.vo.order.RentalOrderSaveReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.rental.RentalOrderDO;
 import cn.iocoder.yudao.module.system.service.rental.RentalOrderService;
 import org.springframework.validation.annotation.Validated;

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

@@ -2,11 +2,8 @@ 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.framework.excel.core.util.ExcelUtils;
-import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
 import cn.iocoder.yudao.module.bpm.api.oa.BpmOARefundApi;
 import cn.iocoder.yudao.module.bpm.api.oa.vo.BpmOARefundDTO;
 import cn.iocoder.yudao.module.system.controller.admin.rental.vo.order.RentalOrderPageReqVO;
@@ -26,9 +23,7 @@ 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;
@@ -36,8 +31,6 @@ 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.common.util.collection.CollectionUtils.convertList;
-import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 
 @Tag(name = "管理后台 - 租赁订单")

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

@@ -1,13 +1,11 @@
 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

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

@@ -10,8 +10,6 @@ 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;
@@ -26,7 +24,6 @@ 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;