平台确认归还 破损订单

src/main/java/com/mmc/oms/model/dto/lease/LeaseOrderDTO.java

@@ -111,6 +111,8 @@ public class LeaseOrderDTO implements Serializable {
     private String modeOfDeliveryInfo;
     @ApiModelProperty("发货后申请退款")
     private LeaseRefundOrderDTO leaseRefundOrder;
+    @ApiModelProperty("商户收货后上传的破损信息")
+    private LeaseRefundOrderDTO storeDamageOrder;
     @ApiModelProperty("商户确认收货信息")
     private LeaseRefundOrderDTO storeReceiveOrder;
 }

src/main/java/com/mmc/oms/service/lease/impl/LeaseOrderServiceImpl.java

@@ -344,10 +344,16 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.REC.getCode());
             leaseOrderDTO.setConfirmReceipt(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
         }
+        // 设置退款信息
         if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
             LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.RETREAT.getCode());
             leaseOrderDTO.setLeaseRefundOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
         }
+        // 设置破损信息
+        if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode())) {
+            LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.PFREC.getCode());
+            leaseOrderDTO.setStoreDamageOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+        }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
         if (userAccountSimpleDTO != null) {
@@ -743,6 +749,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                     return ResultBody.error("请填充破损照片和原因！");
                 }
                 LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(param);
+                leaseRefundOrderDO.setStatus(1);
                 leaseRefundOrderDO.setType(OrderType.PFREC.getCode());
                 leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
                 // 记录修改后的押金退回