bug修复

src/main/java/com/mmc/oms/enums/LeaseOrderStatus.java

@@ -14,6 +14,7 @@ public enum LeaseOrderStatus {
     COMPLETE_TRANSACTION(700, "交易完成", "交易完成"),
     APPLY_REFUND(800, "申请退款", "退款中"),
     MODIFIED_DEPOSIT_TO_BE_CONFIRMED(900, "待确认修改后押金", "待确认修改后押金"),
+    MODIFIED_DEPOSIT_REFUND(950, "待确认修改后押金", "待确认修改后押金"),
     CLOSE(999, "订单关闭", "订单关闭");
 
     public Integer getCode() {

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

@@ -688,6 +688,22 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                 // 解冻用户钱包金额
                 BigDecimal shareAmount = leaseOrderDO.getShareAmount();
                 BigDecimal salaryAmount = leaseOrderDO.getSalaryAmount();
+
+                ApplyRefundVO applyRefundVO = null;
+                if (isApplyRefund && leaseOrderDO.getOtherAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    applyRefundVO = wxRefund(leaseOrderDO);
+                    applyRefundVO.setRefund((leaseOrderDO.getOtherPledge().add(leaseOrderDO.getOtherAmount())).multiply(BigDecimal.valueOf(100)).longValue());
+                } else if (leaseOrderDO.getOtherPledge() != null && leaseOrderDO.getOtherPledge().compareTo(BigDecimal.ZERO) > 0) {
+                    applyRefundVO = wxRefund(leaseOrderDO);
+                }
+
+                if (applyRefundVO != null) {
+                    ResultBody refundOtherPledge = paymentAppApi.applyRefund(applyRefundVO, currentAccount.getToken());
+                    if (!refundOtherPledge.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                        return refundOtherPledge;
+                    }
+                }
+
                 if (shareAmount.compareTo(BigDecimal.ZERO) > 0 || salaryAmount.compareTo(BigDecimal.ZERO) > 0) {
                     // 金额解冻
                     PayUavWalletVO userPayUavWalletVO = amountUnfreezing(leaseOrderDO, shareAmount, salaryAmount);
@@ -696,18 +712,6 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                     if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
                         return resultBody;
                     }
-                    // 退回微信支付的押金部分
-                    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())) {
-                            return refundOtherPledge;
-                        }
-                    }
-                    // 修改退款操作
-                    if (isApplyRefund) {
-                        this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.CLOSE);
-                    }
                     // 如果是交易完成则退回押金
                     if (isWaitingMerchantConfirm) {
                         BigDecimal shareCashPledge = leaseOrderDO.getShareCashPledge();
@@ -717,6 +721,12 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                         }
                     }
                 }
+
+                // 修改退款操作
+                if (isApplyRefund) {
+                    this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.CLOSE);
+                }
+
                 if (isWaitingMerchantConfirm) {
                     return businessIncome(currentAccount, param.getOrderId(), leaseOrderDO);
                 }
@@ -730,7 +740,11 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                 leaseRefundOrderDO.setType(OrderType.PFREC.getCode());
                 leaseOrderDao.addLeaseRefundOrder(leaseRefundOrderDO);
                 // 修改订单状态
+                if (isWaitingMerchantConfirm) {
                     this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED);
+                } else {
+                    this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.MODIFIED_DEPOSIT_REFUND);
+                }
             }
         } else {
             return ResultBody.error("状态流程有误");
@@ -799,9 +813,9 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
         if (leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.REMAIN_TO_BE_EVALUATED.getCode())) {
             return ResultBody.error("请勿重复操作");
         }
-        if (!leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode())) {
-            return ResultBody.error("状态流程有误");
-        }
+        boolean isModifiedConfirmed = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.MODIFIED_DEPOSIT_TO_BE_CONFIRMED.getCode());
+        boolean isRefund = leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.MODIFIED_DEPOSIT_REFUND.getCode());
+        if (isModifiedConfirmed || isRefund) {
             // 根据订单id查询出修改后的押金
             LeaseRefundOrderDO leaseRefundOrderDO = leaseOrderDao.selectGiveBackByOrderId(id, OrderType.PFREC.getCode());
             BigDecimal operatingDeposit = BigDecimal.ZERO;
@@ -858,9 +872,42 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
                     return refundOtherPledge;
                 }
             }
+            if (isModifiedConfirmed) {
                 // 进行平台打款
                 return businessIncome(currentAccount, id, leaseOrderDO);
             }
+            if (isRefund) {
+                // 退回微信的钱
+                if (leaseOrderDO.getOtherAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    ApplyRefundVO applyRefundVO = wxRefund(leaseOrderDO);
+                    applyRefundVO.setRefund((leaseOrderDO.getOtherPledge().add(leaseOrderDO.getOtherAmount())).multiply(BigDecimal.valueOf(100)).longValue());
+                    ResultBody refundOtherPledge = paymentAppApi.applyRefund(applyRefundVO, currentAccount.getToken());
+                    if (!refundOtherPledge.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                        return refundOtherPledge;
+                    }
+                }
+                if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
+                    // 退回云享金及余额
+                    PayUavWalletVO userPayUavWalletVO = new PayUavWalletVO();
+                    userPayUavWalletVO.setUserAccountId(leaseOrderDO.getUserAccountId());
+                    userPayUavWalletVO.setCashAmount(leaseOrderDO.getShareAmount());
+                    userPayUavWalletVO.setSalaryAmount(leaseOrderDO.getSalaryAmount());
+                    userPayUavWalletVO.setRemark("租赁订单退款");
+                    userPayUavWalletVO.setOrderStatus(1700);
+                    ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, currentAccount.getToken());
+                    if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                        return resultBody;
+                    }
+                }
+                // 修改退款操状态
+                this.updateLeaseOrderStatus(id, LeaseOrderStatus.CLOSE);
+            }
+            return ResultBody.success();
+
+        } else {
+            return ResultBody.error("状态流程有误");
+        }
+    }
 
     @Override
     public ResultBody remarkOrder(UavOrderRemarkVO uavOrderRemarkVO) {