优化

src/main/java/com/mmc/oms/entity/lease/LeaseOrderDO.java

@@ -166,7 +166,7 @@ public class LeaseOrderDO implements Serializable {
                 .salaryAmount(salaryAmount).shareAmount(shareAmount).otherAmount(otherAmount).payType(payType).payTime(payTime)
                 .startDate(startDate).endDate(endDate).userRemark(userRemark).sellerRemark(sellerRemark).createTime(createTime)
                 .confirmReceiptTime(confirmReceiptTime).remarkStatus(remarkStatus).modeOfDeliveryInfo(modeOfDeliveryInfo)
-                .unitPrice(unitPrice).deposit(deposit).wareNum(wareNum).sku(sku).skuImg(skuImg).leaseGoodsId(leaseGoodsId)
+                .unitPrice(unitPrice).deposit(deposit).wareNum(wareNum).sku(sku).skuImg(skuImg).leaseGoodsId(leaseGoodsId).otherPledge(otherPledge)
                 .salaryCashPledge(salaryCashPledge).shareCashPledge(shareCashPledge).modeOfDeliveryInfo(modeOfDeliveryInfo).build();
     }
 }

src/main/java/com/mmc/oms/model/dto/lease/LeaseOrderDTO.java

@@ -59,6 +59,8 @@ public class LeaseOrderDTO implements Serializable {
     private BigDecimal salaryCashPledge;
     @ApiModelProperty("其他方式支付额度")
     private BigDecimal otherAmount;
+    @ApiModelProperty("其他方式支付额度")
+    private BigDecimal otherPledge;
     @ApiModelProperty("wechatpay微信，alipay支付宝，offline线下")
     private String payType;
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")

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

@@ -324,7 +324,8 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             return ResultBody.error("订单信息不存在！");
         }
         LeaseOrderDTO leaseOrderDTO = leaseOrderDO.buildLeaseOrderDTO();
-        if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.PLACED_AN_ORDER.getCode())) {
+        Integer statusCode = leaseOrderDO.getStatusCode();
+        if (statusCode.equals(LeaseOrderStatus.PLACED_AN_ORDER.getCode())) {
             leaseOrderDTO.setNeedPayAmount(leaseOrderDO.getOtherAmount());
         }
         // 收货信息、付款信息、规格信息、快递信息、签署信息
@@ -335,24 +336,21 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             KdnExpDTO kdnExpDTO = this.getOrderExpInfo(leaseOrderExpressDO);
             leaseOrderDTO.setKdnExpDTO(kdnExpDTO);
             // 判断订单状态是否是已归还状态
-            if (leaseOrderDO.getStatusCode().compareTo(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) >= 0) {
+            if (statusCode.compareTo(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) >= 0) {
                 // 快递信息
                 KdnExpDTO returnKdnExpDTO = this.getReturnOrderExpInfo(leaseOrderExpressDO);
                 leaseOrderDTO.setReturnKdnExpDTO(returnKdnExpDTO);
             }
             // 设置确认收货信息
-            LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.REC.getCode());
-            leaseOrderDTO.setConfirmReceipt(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+            setConfirmReceiptInfo(id, OrderType.REC.getCode(), leaseOrderDTO);
         }
         // 设置退款信息
-        if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
-            LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.RETREAT.getCode());
-            leaseOrderDTO.setLeaseRefundOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+        if (statusCode.equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
+            setConfirmReceiptInfo(id, OrderType.RETREAT.getCode(), leaseOrderDTO);
         }
         // 设置破损信息
-        if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode())) {
-            LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.PFREC.getCode());
-            leaseOrderDTO.setStoreDamageOrder(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+        if (statusCode.equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode())) {
+            setConfirmReceiptInfo(id, OrderType.PFREC.getCode(), leaseOrderDTO);
         }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
@@ -364,6 +362,26 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         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;
+            }
+        }
+    }
+
+
     private KdnExpDTO getOrderExpInfo(LeaseOrderExpressDO exp) throws Exception {
         String json = "";
         if ("SF".equals(exp.getSendExpCode())) {