修复

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

@@ -409,21 +409,22 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                 if (leaseOrderRefundVO.getExpressCode() == null || leaseOrderRefundVO.getExpressNum() == null) {
                     return ResultBody.error("请完善物流信息");
                 }
+                // 插入退货地址信息
+                LeaseOrderExpressDO leaseOrderExpressDO = new LeaseOrderExpressDO();
+                leaseOrderExpressDO.setId(leaseOrderRefundVO.getId());
+                leaseOrderExpressDO.setLeaseOrderId(leaseOrderRefundVO.getOrderId());
+                leaseOrderExpressDO.setReturnExpCode(leaseOrderRefundVO.getExpressCode());
+                leaseOrderExpressDO.setReturnExpNo(leaseOrderRefundVO.getExpressNum());
+                leaseOrderExpressDO.setReturnTime(new Date());
+                leaseOrderDao.updateLeaseOrderExpress(leaseOrderExpressDO);
+                // 插入退款订单信息
+                LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(leaseOrderRefundVO);
+//                leaseRefundOrderDO.setLeaseOrderExpressId(leaseOrderExpressDO.getId());
+                leaseRefundOrderDO.setType(OrderType.RETREAT.getCode());
+                leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
+                // 修改订单状态
+                leaseOrderDao.updateUavOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.APPLY_REFUND.getCode());
             }
-            // 插入退货地址信息
-            LeaseOrderExpressDO leaseOrderExpressDO = new LeaseOrderExpressDO();
-            leaseOrderExpressDO.setLeaseOrderId(leaseOrderRefundVO.getOrderId());
-            leaseOrderExpressDO.setReturnExpCode(leaseOrderRefundVO.getExpressCode());
-            leaseOrderExpressDO.setReturnExpNo(leaseOrderRefundVO.getExpressNum());
-            leaseOrderExpressDO.setReturnTime(new Date());
-            leaseOrderDao.updateLeaseOrderExpress(leaseOrderExpressDO);
-            // 插入退款订单信息
-            LeaseRefundOrderDO leaseRefundOrderDO = new LeaseRefundOrderDO(leaseOrderRefundVO);
-            leaseRefundOrderDO.setLeaseOrderExpressId(leaseOrderExpressDO.getId());
-            leaseRefundOrderDO.setType(OrderType.RETREAT.getCode());
-            leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
-            // 修改订单状态
-            leaseOrderDao.updateUavOrderStatus(leaseOrderRefundVO.getOrderId(), LeaseOrderStatus.APPLY_REFUND.getCode());
             return ResultBody.success();
         } else {
             // 退云享金、佣金