diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java index b068e47f..c1f5a383 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkDistributionUserMapper.java @@ -29,5 +29,7 @@ public interface MkDistributionUserMapper extends BaseMapper /** * 统计消费金额 */ - BigDecimal getOrderConsumeAmountByList(Long shopId, List userIds,Long userId); + BigDecimal getOrderConsumeAmountByList(Long shopId, Long inviterId); + + BigDecimal getOrderConsumeAmountById(Long shopId, Long userId); } 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 39f66d8d..ff852603 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 @@ -338,11 +338,9 @@ public class MkDistributionUserServiceImpl extends ServiceImpl userIds = shopUserService.listAs(QueryWrapper.create() - .select(ShopUser::getUserId) - .eq(ShopUser::getDistributionUserId, shopUserId), Long.class); - userIds.add(distributionUser.getUserId()); - BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(shopId, userIds, null); + BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(shopId, distributionUser.getId()); + BigDecimal ownTotalAmount = mapper.getOrderConsumeAmountById(shopId, distributionUser.getUserId()); + totalAmount = totalAmount.add(ownTotalAmount); MkDistributionLevelConfig levelConfig = levelConfigService.getOne(QueryWrapper.create() .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId()) .le(MkDistributionLevelConfig::getCostAmount, totalAmount) @@ -431,7 +429,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl userIds = shopUserService.listAs(QueryWrapper.create() - .select(ShopUser::getUserId) - .eq(ShopUser::getDistributionUserId, distributionUser.getId()), Long.class); - userIds.add(distributionUser.getUserId()); - BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(param.getShopId(), userIds, null); + BigDecimal totalAmount = mapper.getOrderConsumeAmountByList(param.getShopId(), distributionUser.getId()); + BigDecimal ownTotalAmount = mapper.getOrderConsumeAmountById(param.getShopId(), distributionUser.getUserId()); + totalAmount = totalAmount.add(ownTotalAmount); levelConfig = levelConfigService.getOne(QueryWrapper.create() .eq(MkDistributionLevelConfig::getShopId, distributionUser.getShopId()) .le(MkDistributionLevelConfig::getCostAmount, totalAmount) diff --git a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml index eec29626..60c500ad 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml @@ -54,20 +54,25 @@ + +