修复收货信息

src/main/java/com/mmc/oms/controller/lease/LeaseOrderController.java

@@ -82,8 +82,8 @@ public class LeaseOrderController extends BaseController {
     @ApiOperation(value = "用户收货")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @GetMapping("receive")
-    public ResultBody receive(@RequestParam Integer id, HttpServletRequest request) {
-        return leaseOrderService.receive(id, this.getCurrentAccount(request));
+    public ResultBody receive(@RequestBody LeaseOrderRefundVO leaseOrderRefundVO, HttpServletRequest request) {
+        return leaseOrderService.receive(leaseOrderRefundVO, this.getCurrentAccount(request));
     }
 
     @ApiOperation(value = "归还商品")

src/main/java/com/mmc/oms/dao/lease/LeaseOrderDao.java

@@ -47,5 +47,5 @@ public interface LeaseOrderDao {
 
     void updateLeaseOrderProportion(Integer id, int proportion);
 
-    LeaseRefundOrderDO selectGiveBackByOrderId(Integer id);
+    LeaseRefundOrderDO selectGiveBackByOrderId(Integer id, Integer type);
 }

src/main/java/com/mmc/oms/service/lease/LeaseOrderService.java

@@ -31,7 +31,7 @@ public interface LeaseOrderService {
 
     ResultBody send(UavOrderExpressVO param);
 
-    ResultBody receive(Integer id, BaseAccountDTO currentAccount);
+    ResultBody receive(LeaseOrderRefundVO leaseOrderRefundVO, BaseAccountDTO currentAccount);
 
     ResultBody statusList();
 

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

@@ -334,10 +334,10 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                 // 快递信息
                 KdnExpDTO returnKdnExpDTO = this.getReturnOrderExpInfo(leaseOrderExpressDO);
                 leaseOrderDTO.setReturnKdnExpDTO(returnKdnExpDTO);
-                // 根据订单id查询归还信息
-                LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id);
-                leaseOrderDTO.setLeaseRefundOrderDTO(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
             }
+            // 设置确认收货信息
+            LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.REC.getCode());
+            leaseOrderDTO.setLeaseRefundOrderDTO(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
         }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
@@ -591,18 +591,24 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
     }
 
     @Override
-    public ResultBody receive(Integer id, BaseAccountDTO currentAccount) {
+    public ResultBody receive(LeaseOrderRefundVO leaseOrderRefundVO, BaseAccountDTO currentAccount) {
         // 修改订单状态
-        LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(id);
+        LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(leaseOrderRefundVO.getOrderId());
         if (!leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.SHIPPED.getCode())) {
             return ResultBody.error("状态流程有误，请重试！");
         }
+        if (StringUtils.isNotEmpty(leaseOrderRefundVO.getFile()) || StringUtils.isNotEmpty(leaseOrderRefundVO.getReason())) {
+            // 插入确认信息
+            LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(leaseOrderRefundVO);
+            leaseRefundOrderDO.setType(OrderType.REC.getCode());
+            leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
+        }
         // 修改收货信息
-        LeaseOrderExpressDO leaseOrderExpress = leaseOrderDao.getLeaseOrderExpress(id);
+        LeaseOrderExpressDO leaseOrderExpress = leaseOrderDao.getLeaseOrderExpress(leaseOrderRefundVO.getOrderId());
         leaseOrderExpress.setReceive(1);
         leaseOrderExpress.setReceiveTime(new Date());
         leaseOrderDao.updateLeaseOrderExpress(leaseOrderExpress);
-        this.updateLeaseOrderStatus(id, LeaseOrderStatus.TO_BE_RETURNED);
+        this.updateLeaseOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.TO_BE_RETURNED);
         return ResultBody.success();
     }
 
@@ -635,10 +641,6 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         }
         LeaseOrderExpressDO leaseOrderExpressDO = new LeaseOrderExpressDO(leaseOrderRefundVO);
         leaseOrderDao.updateLeaseOrderExpress(leaseOrderExpressDO);
-        // 插入归还信息
-        LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(leaseOrderRefundVO);
-        leaseRefundOrderDO.setType(OrderType.RETURN.getCode());
-        leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
         this.updateLeaseOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.WAITING_MERCHANT_CONFIRM);
         return ResultBody.success();
     }

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

@@ -235,6 +235,6 @@ share_cash_pledge,salary_cash_pledge
         select
         <include refid="lease_refund_order_column"/>
         from lease_refund_order
-        where lease_order_id = #{leaseOrderId}
+        where lease_order_id = #{leaseOrderId} and type = #{type}
     </select>
 </mapper>
\ No newline at end of file