修改bug

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

@@ -236,9 +236,9 @@ public class PayWalletServiceImpl implements PayWalletService {
             PayWalletDO publishPayWalletDO = new PayWalletDO();
             publishPayWalletDO.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
             publishPayWalletDO.setPid(publishWallet.getPid());
-            publishPayWalletDO.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
+            publishPayWalletDO.setCashFreeze(publishWallet.getCashFreeze().add(publisherWalletFlowVO.getCashAmount())
                     .add(publisherWalletFlowVO.getUrgentYxjAmount()).add(publisherWalletFlowVO.getTopYxjAmount()));
-            publishPayWalletDO.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getSalaryAmount())
+            publishPayWalletDO.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getSalaryAmount())
                     .add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()));
             int publishUpdateCount = payWalletDao.updatePayWallet(publishPayWalletDO);
             if (publishUpdateCount <= 0) {
@@ -248,14 +248,12 @@ public class PayWalletServiceImpl implements PayWalletService {
             assert flyerWalletFlowVO != null;
             int flyerUpdateCount = addFlyerSalary(publisherWalletFlowVO, flyerWalletFlowVO, flyerWallet);
             if (flyerUpdateCount > 0) {
+                // 记录订单保证金退回记录
+                sendBackPledge(flyerWalletFlowVO);
                 // 记录订单结算流水记录
-                PayLogDO flyerPayLogDO = buildPayLogDO(null, flyerWalletFlowVO);
-                flyerPayLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getFlyerSalaryAmount());
-                flyerPayLogDO.setOperateUser(publisherWalletFlowVO.getUserAccountId());
+                PayLogDO flyerPayLogDO = buildFlyerLog(publisherWalletFlowVO, flyerWalletFlowVO.getUserAccountId());
                 // 插入接单者流水记录表
                 payWalletDao.insertPayLogDO(flyerPayLogDO);
-                // 记录订单保证金退回记录
-                sendBackPledge(flyerWalletFlowVO);
                 return ResultBody.success();
             } else {
                 log.error("正常结算时，接单方用户钱包更新失败，接单者id是：{}，发布者传参是：{}", flyerWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
@@ -292,13 +290,12 @@ public class PayWalletServiceImpl implements PayWalletService {
             assert flyerWalletFlowVO != null;
             int flyerUpdateCount = addFlyerSalary(publisherWalletFlowVO, flyerWalletFlowVO, flyerWallet);
             if (flyerUpdateCount > 0) {
-                // 记录流水记录
-                PayLogDO flyerPayLogDO = buildPayLogDO(null, flyerWalletFlowVO);
-                flyerPayLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getFlyerSalaryAmount());
-                flyerPayLogDO.setOperateUser(publisherWalletFlowVO.getUserAccountId());
+                // 记录订单保证金退回记录
+                sendBackPledge(flyerWalletFlowVO);
+                // 记录订单结算流水记录
+                PayLogDO flyerPayLogDO = buildFlyerLog(publisherWalletFlowVO, flyerWalletFlowVO.getUserAccountId());
                 // 插入接单者流水记录表
                 payWalletDao.insertPayLogDO(flyerPayLogDO);
-                sendBackPledge(flyerWalletFlowVO);
                 return ResultBody.success();
             } else {
                 log.error("飞手未确认修改金额大于原订单状态时，接单方用户钱包更新失败，接单者id是：{}，发布者传参是：{}", flyerWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
@@ -325,13 +322,12 @@ public class PayWalletServiceImpl implements PayWalletService {
             assert flyerWalletFlowVO != null;
             int flyerUpdateCount = addFlyerSalary(publisherWalletFlowVO, flyerWalletFlowVO, flyerWallet);
             if (flyerUpdateCount > 0) {
-                // 记录流水记录
-                PayLogDO flyerPayLogDO = buildPayLogDO(null, flyerWalletFlowVO);
-                flyerPayLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getFlyerSalaryAmount());
-                flyerPayLogDO.setOperateUser(publisherWalletFlowVO.getUserAccountId());
+                // 记录订单保证金退回记录
+                sendBackPledge(flyerWalletFlowVO);
+                // 记录订单结算流水记录
+                PayLogDO flyerPayLogDO = buildFlyerLog(publisherWalletFlowVO, flyerWalletFlowVO.getUserAccountId());
                 // 插入接单者流水记录表
                 payWalletDao.insertPayLogDO(flyerPayLogDO);
-                sendBackPledge(flyerWalletFlowVO);
                 return ResultBody.success();
             } else {
                 log.error("飞手确认修改金额小于原订单状态，接单方用户钱包更新失败，接单者id是：{}，发布者传参是：{}", flyerWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
@@ -340,6 +336,18 @@ public class PayWalletServiceImpl implements PayWalletService {
         return ResultBody.error("钱包操作错误");
     }
 
+    private PayLogDO buildFlyerLog(PublisherWalletFlowVO publisherWalletFlowVO, Integer userAccountId) {
+        PayLogDO payLogWalletDO = new PayLogDO();
+        // 生成支付流水号(规则"T" + 时间戳 + 用户id + 随机数4位)
+        String flyerPayNo = "T" + TDateUtil.getDateStr(new Date(), TDateUtil.TYPE) + userAccountId + CodeUtil.getRandomNum(4);
+        payLogWalletDO.setPayMethod(publisherWalletFlowVO.getModeOfPayment());
+        payLogWalletDO.setPayNo(flyerPayNo);
+        payLogWalletDO.setUserAccountId(userAccountId);
+        payLogWalletDO.setSalaryAmtPaid(publisherWalletFlowVO.getFlyerSalaryAmount());
+        payLogWalletDO.setOperateUser(publisherWalletFlowVO.getUserAccountId());
+        return payLogWalletDO;
+    }
+
     private void sendBackPledge(FlyerWalletFlowVO flyerWalletFlowVO) {
         if (flyerWalletFlowVO.getCashAmount().compareTo(new BigDecimal(0)) > 0 || flyerWalletFlowVO.getSalaryAmount().compareTo(new BigDecimal(0)) > 0) {
             PayLogDO flyerPledgeSendBack = buildPayLogDO(null, flyerWalletFlowVO);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -332,7 +332,10 @@ public class XzServiceImpl implements XzService {
                 if (withdrawCashApplyDetails.getTradeStatus() != null && withdrawCashApplyDetails.getTradeStatus().equals(XzEnums.success.getCode())) {
                     return "success";
                 }
+                // 判断返回的是成功还是失败
+                if (XzEnums.success.getCode().equals(data.getTradeStatus())) {
 
+                }
 
             }
         } else {