diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java index 1241e6c1..6177328d 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java @@ -25,6 +25,6 @@ public interface UserInfoService extends IService { Boolean getCode(Long userId, String type); - void updateDistributionAmount(long userId, BigDecimal amount); + void updateDistributionAmount(long userId, BigDecimal amount, Integer isOne); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java index ebfd6c88..7c933220 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java @@ -125,7 +125,7 @@ public interface MkDistributionUserService extends IService */ void distribute(Long sourceId, String orderNo, BigDecimal amount, Long userId, Long shopId, String type); - void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId); + void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Integer isOne); Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java index 4a96d6a1..09d1a49f 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/UserInfoMapper.java @@ -14,5 +14,5 @@ import java.math.BigDecimal; */ public interface UserInfoMapper extends BaseMapper { - int updateAmount(long userId, BigDecimal amount); + int updateAmount(long userId, BigDecimal amount, Integer isOne); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java index 62be361a..a3f6f484 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java @@ -101,8 +101,8 @@ public class UserInfoServiceImpl extends ServiceImpl i } @Override - public void updateDistributionAmount(long userId, BigDecimal amount) { - int b = mapper.updateAmount(userId, amount); + public void updateDistributionAmount(long userId, BigDecimal amount, Integer isOne) { + int b = mapper.updateAmount(userId, amount, isOne); if (b <= 0) { throw new CzgException("更新分销金额失败"); } diff --git a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml index 22610f3b..4e7d900b 100644 --- a/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/UserInfoMapper.xml @@ -6,6 +6,12 @@ update tb_user_info set distribution_amount = distribution_amount + #{amount} where id = #{userId} + + ,one_income = one_income + #{amount} + + + ,two_income = two_income + #{amount} + and distribution_amount + #{amount} >= 0 diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java index ad25b425..2450277d 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java @@ -579,6 +579,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl 0) { long count = distributionFlowService.count(new QueryWrapper().eq(MkDistributionFlow::getSourceShopUserId, sourceShopUser.getId()) @@ -617,7 +618,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl