bug修复

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

@@ -617,47 +617,48 @@ public class LeaseOrderServiceImpl implements LeaseOrderService {
     public ResultBody pfConfirmOrderWare(BaseAccountDTO currentAccount, LeaseOrderRefundVO param) {
         LeaseOrderDO leaseOrderDO = leaseOrderDao.detail(param.getOrderId());
         log.info("leaseOrderDO:{}", JSONObject.toJSONString(leaseOrderDO));
-        if (!leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.WAITING_MERCHANT_CONFIRM.getCode()) || !leaseOrderDO.getStatusCode().equals(LeaseOrderStatus.APPLY_REFUND.getCode())) {
-            return ResultBody.error("状态流程有误，请重试！");
-        }
-        if (param.getDamage().equals(0)) {
-            // 解冻用户钱包金额
-            if (leaseOrderDO.getShareAmount().compareTo(BigDecimal.ZERO) > 0 || leaseOrderDO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
-                PayUavWalletVO userPayUavWalletVO = new PayUavWalletVO();
-                userPayUavWalletVO.setRemark("租赁订单金额解冻");
-                userPayUavWalletVO.setCashAmount(leaseOrderDO.getShareAmount());
-                userPayUavWalletVO.setSalaryAmount(leaseOrderDO.getSalaryAmount());
-                userPayUavWalletVO.setUserAccountId(leaseOrderDO.getUserAccountId());
-                userPayUavWalletVO.setOrderStatus(999);
-                ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, currentAccount.getToken());
+        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) {
+                    PayUavWalletVO userPayUavWalletVO = new PayUavWalletVO();
+                    userPayUavWalletVO.setRemark("租赁订单金额解冻");
+                    userPayUavWalletVO.setCashAmount(leaseOrderDO.getShareAmount());
+                    userPayUavWalletVO.setSalaryAmount(leaseOrderDO.getSalaryAmount());
+                    userPayUavWalletVO.setUserAccountId(leaseOrderDO.getUserAccountId());
+                    userPayUavWalletVO.setOrderStatus(999);
+                    ResultBody resultBody = userAppApi.feignPayUavWallet(userPayUavWalletVO, currentAccount.getToken());
+                    if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                        return resultBody;
+                    }
+                }
+                BigDecimal thirdAmount = leaseOrderDO.getOrderTotalAmount().multiply(
+                        BigDecimal.valueOf(100).subtract(UavOrderProportion.PROPORTION).divide(BigDecimal.valueOf(100)));
+                PayUavWalletVO payUavWalletVO = new PayUavWalletVO();
+                payUavWalletVO.setSalaryAmount(thirdAmount);
+                payUavWalletVO.setCashAmount(BigDecimal.ZERO);
+                payUavWalletVO.setRemark("租赁订单收入，订单编号" + leaseOrderDO.getOrderNo());
+                payUavWalletVO.setOrderStatus(1500);
+                // 拿到商家管理员的用户id
+                ResultBody managerRes = userAppApi.getManagerIdByBackUserId(leaseOrderDO.getThirdBackUserAccountId(), null);
+                if (!managerRes.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
+                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                    return managerRes;
+                }
+                payUavWalletVO.setUserAccountId((Integer) managerRes.getResult());
+                ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, currentAccount.getToken());
                 if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
                     TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                     return resultBody;
                 }
+                leaseOrderDao.updateLeaseOrderProportion(leaseOrderDO.getId(), UavOrderProportion.PROPORTION.intValue());
+                this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.REMAIN_TO_BE_EVALUATED);
+            } else {
+                // todo 进行相应赔偿
             }
-            BigDecimal thirdAmount = leaseOrderDO.getOrderTotalAmount().multiply(
-                    BigDecimal.valueOf(100).subtract(UavOrderProportion.PROPORTION).divide(BigDecimal.valueOf(100)));
-            PayUavWalletVO payUavWalletVO = new PayUavWalletVO();
-            payUavWalletVO.setSalaryAmount(thirdAmount);
-            payUavWalletVO.setCashAmount(BigDecimal.ZERO);
-            payUavWalletVO.setRemark("租赁订单收入，订单编号" + leaseOrderDO.getOrderNo());
-            payUavWalletVO.setOrderStatus(1500);
-            // 拿到商家管理员的用户id
-            ResultBody managerRes = userAppApi.getManagerIdByBackUserId(leaseOrderDO.getThirdBackUserAccountId(), null);
-            if (!managerRes.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return managerRes;
-            }
-            payUavWalletVO.setUserAccountId((Integer) managerRes.getResult());
-            ResultBody resultBody = userAppApi.feignPayUavWallet(payUavWalletVO, currentAccount.getToken());
-            if (!resultBody.getCode().equals(ResultEnum.SUCCESS.getResultCode())) {
-                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-                return resultBody;
-            }
-            leaseOrderDao.updateLeaseOrderProportion(leaseOrderDO.getId(), UavOrderProportion.PROPORTION.intValue());
-            this.updateLeaseOrderStatus(param.getOrderId(), LeaseOrderStatus.REMAIN_TO_BE_EVALUATED);
         } else {
-            // todo 进行相应赔偿
+            return ResultBody.error("状态流程有误，请重试！");
         }
         return ResultBody.success();
     }