6

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

@@ -141,15 +141,17 @@ public class PayWalletServiceImpl implements PayWalletService {
             publishUpdatePayWallet.setSalaryAmt(publishWallet.getSalaryAmt().add(publisherWalletFlowVO.getSalaryAmount()));
             publishUpdatePayWallet.setSalaryFreeze(publishWallet.getSalaryFreeze().add(publisherWalletFlowVO.getSalaryCashPledge())
                     .subtract(publisherWalletFlowVO.getSalaryAmount()));
-            // 更新发布者钱包数据
-            int publishUpdateCount = payWalletDao.updatePayWallet(publishUpdatePayWallet);
-            if (publishUpdateCount <= 0) {
-                log.error("发布方取消订单，有飞手接单时，发单方用户钱包更新失败，更新参数是：{},发单方用户id是:{}，传入参数是：{}", publishUpdatePayWallet, publisherWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
-                return ResultBody.error("钱包操作错误");
+            if (publisherWalletFlowVO.getCashAmount().compareTo(BigDecimal.ZERO) > 0 || publisherWalletFlowVO.getSalaryAmount().compareTo(BigDecimal.ZERO) > 0) {
+                // 更新发布者钱包数据
+                int publishUpdateCount = payWalletDao.updatePayWallet(publishUpdatePayWallet);
+                if (publishUpdateCount <= 0) {
+                    log.error("发布方取消订单，有飞手接单时，发单方用户钱包更新失败，更新参数是：{},发单方用户id是:{}，传入参数是：{}", publishUpdatePayWallet, publisherWalletFlowVO.getUserAccountId(), publisherWalletFlowVO);
+                    return ResultBody.error("钱包操作错误");
+                }
+                PayLogDO publishPayLogDO = buildPayLogDO(publisherWalletFlowVO, null);
+                // 插入发布者流水记录表
+                payWalletDao.insertPayLogDO(publishPayLogDO);
             }
-            PayLogDO publishPayLogDO = buildPayLogDO(publisherWalletFlowVO, null);
-            // 插入发布者流水记录表
-            payWalletDao.insertPayLogDO(publishPayLogDO);
             // 飞手钱包更新信息
             PayWalletDO flyerUpdatePayWallet = new PayWalletDO();
             // 断言此处必定不为空

csm-service/cms-service-user/src/main/resources/mapper/wallet/PayWalletDao.xml

@@ -275,7 +275,7 @@
         select count(*)
         from withdrawal_log
         <where>
-            pl.user_account_id = #{userAccountId}
+            user_account_id = #{userAccountId}
             <if test="startTime != null and startTime != '' ">
                 and pay_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d
                 %H:%i:%s')