修复

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

@@ -158,6 +158,8 @@ public class LeaseOrderDO implements Serializable {
 
     private BigDecimal salaryCashPledge;
 
+    private BigDecimal otherPledge;
+
     public LeaseOrderDTO buildLeaseOrderDTO() {
         return LeaseOrderDTO.builder().id(id).orderNo(orderNo).orderName(orderName).statusCode(statusCode).userAccountId(userAccountId)
                 .thirdBackUserAccountId(thirdBackUserAccountId).companyName(companyName).orderTotalAmount(orderTotalAmount)

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

@@ -89,12 +89,12 @@ public class LeaseOrderDTO implements Serializable {
     private Date updateTime;
     @ApiModelProperty("用户收货地址信息")
     private UavOrderExpressDTO uavOrderExpressDTO;
-    @ApiModelProperty("快递信息")
+    @ApiModelProperty("发货快递信息")
     private KdnExpDTO kdnExpDTO;
     @ApiModelProperty("归还快递信息")
     private KdnExpDTO returnKdnExpDTO;
-    @ApiModelProperty("归还上传的信息")
-    private LeaseRefundOrderDTO leaseRefundOrderDTO;
+    @ApiModelProperty("确认收货的信息")
+    private LeaseRefundOrderDTO confirmReceipt;
     @ApiModelProperty("购买数量")
     private Integer wareNum;
     @ApiModelProperty(value = "单价", hidden = true)

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

@@ -149,6 +149,8 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         // 校验云享金、钱包余额是否足够抵扣
         BigDecimal shareAmount = BigDecimal.ZERO;
         BigDecimal salaryAmount = BigDecimal.ZERO;
+        // 其他抵扣押金
+        BigDecimal otherPledge = BigDecimal.ZERO;
         Integer statusCode = null;
         // 获取用户钱包信息
         if (param.getDeductSalaryAmount().equals(1) || param.getDeductShareAmount().equals(1)) {
@@ -179,6 +181,8 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                         otherCashPledge = otherCashPledge.subtract(salaryCashPledge);
                         if (otherCashPledge.compareTo(BigDecimal.ZERO) == 0) {
                             otherAmount = otherAmount.subtract(salaryCashPledge.add(shareCashPledge));
+                        } else {
+                            otherPledge = otherCashPledge;
                         }
                     }
                 }
@@ -236,6 +240,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         leaseOrderDO.setCompanyName(param.getCompanyName());
         leaseOrderDO.setThirdBackUserAccountId(param.getThirdBackUserAccountId());
         leaseOrderDO.setOrderName(leaseGoodsVO.getTradeName());
+        leaseOrderDO.setOtherPledge(otherPledge);
         leaseOrderDO.setModeOfDeliveryInfo(leaseGoodsVO.getModeOfDeliveryInfo());
         if (priceStock.getSkuImage() != null) {
             leaseOrderDO.setSkuImg(priceStock.getSkuImage());
@@ -337,7 +342,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             }
             // 设置确认收货信息
             LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.REC.getCode());
-            leaseOrderDTO.setLeaseRefundOrderDTO(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
+            leaseOrderDTO.setConfirmReceipt(leaseRefundOrderDO == null ? null : leaseRefundOrderDO.buildLeaseRefundOrderDTO());
         }
         // 设置个人信息
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(leaseOrderDO.getUserAccountId(), currentAccount.getToken());
@@ -376,7 +381,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             json = KdnExpressUtil.others(exp.getReturnExpCode(), exp.getReturnExpNo());
         }
         KdnExpDTO kdn = JsonUtil.parseJsonToObj(json, KdnExpDTO.class);
-        kdn.setLogisticCode(exp.getReturnExpCode());
+        kdn.setLogisticCode(exp.getReturnExpNo());
         if (!org.springframework.util.CollectionUtils.isEmpty(kdn.getTraces())) {
             Collections.sort(kdn.getTraces(), Comparator.comparing(ExpStationsDTO::getAcceptTime).reversed());// 升序
         }
@@ -654,7 +659,8 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) || leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
             if (param.getDamage().equals(0)) {
                 // 解冻用户钱包金额
-                if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
+                if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0
+                        || leaseOrderDO.getShareCashPledge().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryCashPledge().compareTo(BigDecimal.ZERO) > 0) {
                     PayUavWalletVO userPayUavWalletVO = new PayUavWalletVO();
                     userPayUavWalletVO.setRemark("租赁订单金额解冻");
                     userPayUavWalletVO.setCashAmount(leaseOrderDO.getShareAmount());

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

@@ -24,6 +24,7 @@
                                  start_date,
                                  share_cash_pledge,
                                  salary_cash_pledge,
+                                 other_pledge,
                                  mode_of_delivery_Info,
                                  end_date,
                                  sku)
@@ -31,7 +32,7 @@
                 #{orderName}, #{skuImg}, #{orderTotalAmount}, #{salaryAmount}, #{shareAmount}, #{otherAmount},
                 #{userAddressId},
                 #{payTime}, #{userRemark}, #{unitPrice}, #{wareNum}, #{deposit}, #{startDate}, #{shareCashPledge},
-                #{salaryCashPledge}, #{modeOfDeliveryInfo}, #{endDate}, #{sku});
+                #{salaryCashPledge}, #{otherPledge}, #{modeOfDeliveryInfo}, #{endDate}, #{sku});
     </insert>
     <insert id="addAddress" keyProperty="id" useGeneratedKeys="true"
             parameterType="com.mmc.oms.entity.lease.LeaseOrderExpressDO">