bug修复

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

@@ -347,39 +347,33 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             setConfirmReceiptInfo(id, OrderType.REC.getCode(), leaseOrderDTO);
         }
         // 设置退款信息
-        if (statusCode.equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
-            setConfirmReceiptInfo(id, OrderType.RETREAT.getCode(), leaseOrderDTO);
-        }
+        setConfirmReceiptInfo(id, OrderType.RETREAT.getCode(), leaseOrderDTO);
         // 设置破损信息
-        if (statusCode.equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode())) {
-            setConfirmReceiptInfo(id, OrderType.PFREC.getCode(), leaseOrderDTO);
-        }
+        setConfirmReceiptInfo(id, OrderType.PFREC.getCode(), leaseOrderDTO);
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
         if (userAccountSimpleDTO != null) {
-            leaseOrderDTO.setUserName(userAccountSimpleDTO.getUserName());
             leaseOrderDTO.setNickname(userAccountSimpleDTO.getNickName());
             leaseOrderDTO.setPhoneNum(userAccountSimpleDTO.getPhoneNum());
+            leaseOrderDTO.setUserName(userAccountSimpleDTO.getUserName());
         }
         return ResultBody.success(leaseOrderDTO);
     }
 
     private void setConfirmReceiptInfo(Integer id, Integer orderType, LeaseOrderDTO leaseOrderDTO) {
         LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, orderType);
-        if (leaseRefundOrderDO != null) {
-            switch (orderType) {
-                case 1:
-                    leaseOrderDTO.setConfirmReceipt(leaseRefundOrderDO.buildLeaseRefundOrderDTO());
-                    break;
-                case 4:
-                    leaseOrderDTO.setLeaseRefundOrder(leaseRefundOrderDO.buildLeaseRefundOrderDTO());
-                    break;
-                case 3:
-                    leaseOrderDTO.setStoreDamageOrder(leaseRefundOrderDO.buildLeaseRefundOrderDTO());
-                    break;
-                default:
-                    break;
-            }
+        switch (orderType) {
+            case 1:
+                leaseOrderDTO.setConfirmReceipt(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+                break;
+            case 4:
+                leaseOrderDTO.setLeaseRefundOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+                break;
+            case 3:
+                leaseOrderDTO.setStoreDamageOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+                break;
+            default:
+                break;
         }
     }