From d96d692b6188814c7fbb7d3994473dd586d514bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=9D=BE?= <8605635+zhang3064194730@user.noreply.gitee.com> Date: Thu, 6 Nov 2025 10:46:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/task/DistributionTask.java | 4 ++-- .../czg/account/service/ShopUserService.java | 2 +- .../service/MkDistributionUserService.java | 2 +- .../account/mapper/ShopUserMapper.java | 2 +- .../service/impl/ShopUserServiceImpl.java | 4 ++-- .../main/resources/mapper/ShopUserMapper.xml | 6 ++--- .../impl/MkDistributionUserServiceImpl.java | 24 ++++++++++--------- 7 files changed, 23 insertions(+), 21 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java index e10e9c768..3ed00743a 100644 --- a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java +++ b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java @@ -79,9 +79,9 @@ public class DistributionTask { } else { item.setStatus(TableValueConstant.DistributionFlow.Status.SUCCESS.getCode()); ShopUser shopUser = shopUserService.getById(item.getDistributionUserId()); - distributionUserService.updateIncome(item.getRewardAmount().negate(), item.getRewardAmount(), BigDecimal.ZERO, - item.getDistributionUserId(), shopUser.getUserId(), item.getShopId(), item.getLevel()); distributionUserService.updateShopInfoAmount(orderInfo.getShopId(), item.getRewardAmount().negate(), orderInfo.getId(), TableValueConstant.DistributionAmountFlow.Type.SUB, "分销扣减"); + distributionUserService.updateIncome(item.getRewardAmount().negate(), item.getRewardAmount(), BigDecimal.ZERO, + item.getDistributionUserId(), shopUser.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel()); } distributionFlowService.updateById(item); }); diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java index 2e1e2b050..72397348f 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopUserService.java @@ -36,5 +36,5 @@ public interface ShopUserService extends IService { List selectBirthdayUser(LocalDate current, Long mainShopId, String userType); - void updateOneOrTwoAmount(Long userId, Long mainShopId, BigDecimal bigDecimal, Integer isOne); + void updateOneOrTwoAmount(Long shopUserId, Long shopId, BigDecimal bigDecimal, 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 bacda8fed..97dc57c69 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 @@ -132,7 +132,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, Long shopId, Integer isOne); + void updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id, Long userId, Long shopUserId, Long shopId, Integer isOne); Boolean withdraw(long userId, MkDistributionWithdrawFlowDTO withdrawFlowDTO); diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java index d8500c0c2..8127a45cd 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/ShopUserMapper.java @@ -72,6 +72,6 @@ public interface ShopUserMapper extends BaseMapper { */ List getInviteUser(Long distributionUserId, Long shopUserId, Long distributionLevelId); - void updateOneOrTwoAmount(Long userId, Long mainShopId, BigDecimal amount, Integer isOne); + void updateOneOrTwoAmount(Long shopUserId, Long shopId, BigDecimal amount, Integer isOne); } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java index d2ddfe3ac..14ee0c00d 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java @@ -171,7 +171,7 @@ public class ShopUserServiceImpl extends ServiceImpl i } @Override - public void updateOneOrTwoAmount(Long userId, Long mainShopId, BigDecimal bigDecimal, Integer isOne) { - mapper.updateOneOrTwoAmount(userId, mainShopId, bigDecimal, isOne); + public void updateOneOrTwoAmount(Long shopUserId, Long shopId, BigDecimal bigDecimal, Integer isOne) { + mapper.updateOneOrTwoAmount(shopUserId, shopId, bigDecimal, isOne); } } diff --git a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml index a240e0bf6..4fda24040 100644 --- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml +++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml @@ -18,7 +18,7 @@ and amount - #{money} >= 0 - update tb_shop_user + update tb_shop_user_invite one_income = one_income + #{amount} @@ -27,8 +27,8 @@ two_income = two_income + #{amount} - where user_id = #{userId} - and main_shop_id = #{mainShopId} + where shop_user_id = #{shopUserId} + and shop_id = #{shopId} 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 fb5998c07..a05d4e175 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 @@ -578,7 +578,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl