bug修复

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

@@ -454,19 +454,17 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
             return ResultBody.success();
         } else {
             // 退云享金、佣金
-            if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
-                PayUavWalletVO payUavWalletVO = new PayUavWalletVO();
-                payUavWalletVO.setCashAmount(leaseOrderDO.getShareAmount());
-                payUavWalletVO.setSalaryAmount(leaseOrderDO.getSalaryAmount());
-                payUavWalletVO.setOrderStatus(1400);
-                payUavWalletVO.setUserAccountId(leaseOrderDO.getUserAccountId());
-                ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, token);
+            if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0 ||
+                    leaseOrderDO.getSalaryCashPledge().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getShareCashPledge().compareTo(BigDecimal.ZERO) > 0) {
+                PayUavWalletVO userPayUavWalletVO = amountUnfreezing(leaseOrderDO, leaseOrderDO.getShareAmount(), leaseOrderDO.getSalaryAmount());
+                userPayUavWalletVO.setOrderStatus(1400);
+                ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, token);
                 if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
                     return resultBody;
                 }
             }
             // 微信退款
-            if ("wechatpay".equals(leaseOrderDO.getPayType())) {
+            if (leaseOrderDO.getOtherPledge() != null && leaseOrderDO.getOtherPledge().compareTo(BigDecimal.ZERO) > 0) {
                 ApplyRefundVO applyRefundVO = new ApplyRefundVO();
                 applyRefundVO.setOutTradeNo(leaseOrderDO.getOrderNo());
                 applyRefundVO.setReason("关闭租赁订单");
@@ -707,7 +705,7 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                         return resultBody;
                     }
                     // 退回微信支付的押金部分
-                    if (leaseOrderDO.getOtherPledge().compareTo(BigDecimal.ZERO) > 0) {
+                    if (leaseOrderDO.getOtherPledge() != null && leaseOrderDO.getOtherPledge().compareTo(BigDecimal.ZERO) > 0) {
                         ApplyRefundVO applyRefundVO = wxRefund(leaseOrderDO);
                         ResultBody refundOtherPledge = paymentAppApi.applyRefund(applyRefundVO, currentAccount.getToken());
                         if (!refundOtherPledge.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {