平台确认

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

@@ -344,6 +344,10 @@ 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());
+        }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
         if (userAccountSimpleDTO != null) {
@@ -729,9 +733,13 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                     leaseOrderDao.updateLeaseOrderProportion(leaseOrderDO.getId(), UavOrderProportion.PROPORTION.intValue());
                     this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.REMAIN_TO_BE_EVALUATED);
                 }
+            } else {
+
+                // 有破损等待平台
             }
         } else {
             // todo 进行相应赔偿
+            return ResultBody.error("状态流程有误，请重试");
         }
         return ResultBody.success();
     }

src/main/resources/mapper/lease/LeaseOrderDao.xml

@@ -117,7 +117,7 @@
 order_name,sku_img,sku,order_total_amount,salary_amount,share_amount,other_amount,pay_type,
 user_address_id,user_remark,seller_remark,pay_time,confirm_receipt_time,version,remark_status,mode_of_delivery_Info,
 proportion,show_user_port,create_time,update_time,unit_price,ware_num,deposit,start_date,end_date,shut_reason,
-share_cash_pledge,salary_cash_pledge
+share_cash_pledge,salary_cash_pledge,other_pledge
     </sql>
 
     <select id="detail" resultType="com.mmc.oms.entity.lease.LeaseOrderDO">