金额退回

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/wallet/impl/PayWalletServiceImpl.java

@@ -287,9 +287,11 @@ public class PayWalletServiceImpl implements PayWalletService {
             publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
             publishUpdatePayWallet.setPid(publishWallet.getPid());
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getRefundSalaryAmount()));
-            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getRefundSalaryAmount()));
+            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getRefundSalaryAmount())
+                    .add(publisherWalletFlowVO.getSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()).add(publisherWalletFlowVO.getTopSalaryAmount()));
             publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getRefundCashAmount()));
-            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getRefundCashAmount()));
+            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getRefundCashAmount())
+                    .add(publisherWalletFlowVO.getCashAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()).add(publisherWalletFlowVO.getTopYxjAmount()));
             int publishUpdateCount = payWalletDao.updatePayWallet(publishUpdatePayWallet);
             if (publishUpdateCount <= 0) {
                 log.error("飞手未确认修改金额大于原订单状态时，发布者用户钱包更新失败，发布者id是：{}，发布者参数是：{}", publisherWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
@@ -435,8 +437,9 @@ public class PayWalletServiceImpl implements PayWalletService {
     }
 
     private void refund(PublisherWalletFlowVO publisherWalletFlowVO) {
-        if (publisherWalletFlowVO.getRefundCashAmount().compareTo(BigDecimal.ZERO) != 0 || publisherWalletFlowVO.getRefundSalaryAmount().compareTo(BigDecimal.ZERO) != 0) {
+        if (publisherWalletFlowVO.getRefundCashAmount().compareTo(BigDecimal.ZERO) > 0 || publisherWalletFlowVO.getRefundSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
             PayLogDO publishPayLogDO = buildPayLogDO(publisherWalletFlowVO, null);
+            publishPayLogDO.setPayMethod(200);
             publishPayLogDO.setCashAmtPaid(publisherWalletFlowVO.getRefundCashAmount());
             publishPayLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getRefundSalaryAmount());
             payWalletDao.insertPayLogDO(publishPayLogDO);
@@ -581,13 +584,6 @@ public class PayWalletServiceImpl implements PayWalletService {
     public ResultBody payUavWallet(PayUavWalletVO payUavWalletVO) {
         // 获取用户钱包信息
         PayWalletDO userWalletInfo = payWalletDao.getPayWalletByUser(payUavWalletVO.getUserAccountId());
-        // 获取下单金额是否大于该用户钱包金额
-        if (userWalletInfo.getCashAmt().compareTo(payUavWalletVO.getCashAmount()) < 0) {
-            return ResultBody.error("可抵扣的云享金不足");
-        }
-        if (userWalletInfo.getSalaryAmt().compareTo(payUavWalletVO.getSalaryAmount()) < 0) {
-            return ResultBody.error("可抵扣的佣金不足");
-        }
         String payNo = "T" + TDateUtil.getDateStr(new Date(), TDateUtil.TYPE) + payUavWalletVO.getUserAccountId() + CodeUtil.getRandomNum(4);
         // 记录流水用户钱包流水记录
         PayLogDO payLogDO = new PayLogDO();
@@ -601,6 +597,13 @@ public class PayWalletServiceImpl implements PayWalletService {
         payWalletDO.setUserAccountId(payUavWalletVO.getUserAccountId());
         // 判断当前订单状态是什么类型
         if (payUavWalletVO.getOrderStatus().equals(PayMethodEnums.PUBLISH_ORDER.getCode())) {
+            // 获取下单金额是否大于该用户钱包金额
+            if (userWalletInfo.getCashAmt().compareTo(payUavWalletVO.getCashAmount()) < 0) {
+                return ResultBody.error("可抵扣的云享金不足");
+            }
+            if (userWalletInfo.getSalaryAmt().compareTo(payUavWalletVO.getSalaryAmount()) < 0) {
+                return ResultBody.error("可抵扣的佣金不足");
+            }
             payLogDO.setPayMethod(payUavWalletVO.getOrderStatus());
             if (payUavWalletVO.getCashAmount().compareTo(BigDecimal.ZERO) > 0) {
                 payLogDO.setCashAmtPaid(payUavWalletVO.getCashAmount().negate());