bug修复

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

@@ -332,7 +332,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         }
         // 收货信息、付款信息、规格信息、快递信息、签署信息
         LeaseOrderExpressDO leaseOrderExpressDO = leaseOrderDao.getLeaseOrderExpress(id);
-        if (leaseOrderExpressDO != null) {
+        if (!statusCode.equals(LeaseOrderStatus.CLOSE.getCode()) && leaseOrderExpressDO != null) {
             leaseOrderDTO.setUavOrderExpressDTO(leaseOrderExpressDO.buildUavOrderExpressDTO());
             // 快递信息
             KdnExpDTO kdnExpDTO = this.getOrderExpInfo(leaseOrderExpressDO);
@@ -345,11 +345,11 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             }
             // 设置确认收货信息
             setConfirmReceiptInfo(id, OrderType.REC.getCode(), leaseOrderDTO);
+            // 设置退款信息
+            setConfirmReceiptInfo(id, OrderType.RETREAT.getCode(), leaseOrderDTO);
+            // 设置破损信息
+            setConfirmReceiptInfo(id, OrderType.PFREC.getCode(), leaseOrderDTO);
         }
-        // 设置退款信息
-        setConfirmReceiptInfo(id, OrderType.RETREAT.getCode(), leaseOrderDTO);
-        // 设置破损信息
-        setConfirmReceiptInfo(id, OrderType.PFREC.getCode(), leaseOrderDTO);
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
         if (userAccountSimpleDTO != null) {