bug修复

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

@@ -202,8 +202,8 @@ public class PayWalletServiceImpl implements PayWalletService {
                     .add(publisherWalletFlowVO.getTopYxjAmount()).add(publisherWalletFlowVO.getTopYxjAmount())
                     .add(publisherWalletFlowVO.getUrgentYxjAmount()));
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount()
-                    .add(publisherWalletFlowVO.getUrgentSalaryAmount()))
-                    .subtract(flyerWalletFlowVO.getPercentagePenaltyOfOrder()));
+                    .add(publisherWalletFlowVO.getUrgentSalaryAmount()).add(publisherWalletFlowVO.getTopSalaryAmount()))
+                    .add(flyerWalletFlowVO.getPercentagePenaltyOfOrder().abs()));
 
             publishUpdatePayWallet.setCashFreeze(publishWallet.getCashFreeze().subtract(publisherWalletFlowVO.getCashAmount())
                     .subtract(publisherWalletFlowVO.getUrgentYxjAmount()).subtract(publisherWalletFlowVO.getTopYxjAmount()));
@@ -647,8 +647,6 @@ public class PayWalletServiceImpl implements PayWalletService {
         // 如果是100 扣减余额冻结金额
         payWalletDO.setCashAmt(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
         payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().add(payUavWalletVO.getCashAmount()));
-        payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().subtract(payUavWalletVO.getSalaryAmount()));
-        payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);
         return ResultBody.success();
@@ -662,8 +660,6 @@ public class PayWalletServiceImpl implements PayWalletService {
         // 如果是1400 回滚解冻金额
         payWalletDO.setCashAmt(userWalletInfo.getCashAmt().add(payUavWalletVO.getCashAmount()));
         payWalletDO.setCashFreeze(userWalletInfo.getCashAmt().subtract(payUavWalletVO.getCashAmount()));
-        payWalletDO.setSalaryAmt(userWalletInfo.getSalaryAmt().add(payUavWalletVO.getSalaryAmount()));
-        payWalletDO.setSalaryFreeze(userWalletInfo.getSalaryAmt().subtract(payUavWalletVO.getSalaryAmount()));
         payWalletDao.insertPayLogDO(payLogDO);
         payWalletDao.updatePayWallet(payWalletDO);
         return ResultBody.success();