修改钱包流水bug

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

@@ -115,9 +115,11 @@ public class PayWalletServiceImpl implements PayWalletService {
             publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
             publishUpdatePayWallet.setPid(publishWallet.getPid());
             publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount()));
-            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getUrgentYxjAmount()).subtract(publisherWalletFlowVO.getCashAmount()));
+            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().add(publisherWalletFlowVO.getTopYxjAmount())
+                    .add(publisherWalletFlowVO.getUrgentYxjAmount()).subtract(publisherWalletFlowVO.getCashAmount()));
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount()));
-            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getTopSalaryAmount()).add(publisherWalletFlowVO.getUrgentSalaryAmount()).subtract(publisherWalletFlowVO.getSalaryAmount()));
+            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getTopSalaryAmount())
+                    .add(publisherWalletFlowVO.getUrgentSalaryAmount()).subtract(publisherWalletFlowVO.getSalaryAmount()));
             int i = payWalletDao.updatePayWallet(publishUpdatePayWallet);
             if (i > 0) {
                 PayLogDO payLogDO = buildPayLogDO(publisherWalletFlowVO, null);
@@ -134,9 +136,11 @@ public class PayWalletServiceImpl implements PayWalletService {
             publishUpdatePayWallet.setUserAccountId(publisherWalletFlowVO.getUserAccountId());
             publishUpdatePayWallet.setPid(publishWallet.getPid());
             publishUpdatePayWallet.setCashAmt(publishWallet.getCashAmt().add(publisherWalletFlowVO.getCashAmount()));
-            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount()).add(publisherWalletFlowVO.getYxjCashPledge()));
+            publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
+                    .add(publisherWalletFlowVO.getYxjCashPledge()).add(publisherWalletFlowVO.getYxjCashPledge()));
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount()));
-            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().subtract(publisherWalletFlowVO.getSalaryAmount()).add(publisherWalletFlowVO.getSalaryCashPledge()));
+            publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getSalaryCashPledge())
+                    .subtract(publisherWalletFlowVO.getSalaryAmount()).add(publisherWalletFlowVO.getSalaryCashPledge()));
             // 更新发布者钱包数据
             int publishUpdateCount = payWalletDao.updatePayWallet(publishUpdatePayWallet);
             if (publishUpdateCount <= 0) {
@@ -344,7 +348,7 @@ public class PayWalletServiceImpl implements PayWalletService {
             flyerPayLogDO.setPayMethod(1300);
             flyerPayLogDO.setPayNo(flyerPayNo);
             flyerPayLogDO.setUserAccountId(flyerWalletFlowVO.getUserAccountId());
-            flyerPayLogDO.setCashAmtPaid(flyerWalletFlowVO.getCashAmount());
+            flyerPayLogDO.setCashAmtPaid(new BigDecimal((0)));
             flyerPayLogDO.setSalaryAmtPaid(publisherWalletFlowVO.getPercentagePenaltyOfOrder().abs());
             flyerPayLogDO.setOperateUser(publisherWalletFlowVO.getOperateUserAccountId());
             // 插入流水记录表