From 618374564e87dbc1eac3baa1f0947a1718001479 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 27 Oct 2025 21:26:24 +0800 Subject: [PATCH] id --- .../service/market/mapper/MkDistributionUserMapper.java | 4 ++-- .../main/resources/mapper/MkDistributionUserMapper.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) 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 ea25992a..7a063d0a 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 @@ -18,11 +18,11 @@ public interface MkDistributionUserMapper extends BaseMapper /** * 查询我的分销店铺列表 已开通 */ - List selectMyDistributionShops(Long shopUserId); + List selectMyDistributionShops(Long userId); /** * 查询我的分销店铺列表 未开通 */ - List selectUnDistributionShops(Long shopUserId); + List selectUnDistributionShops(Long userId); boolean updateIncome(BigDecimal pendingIncome, BigDecimal receivedIncome, BigDecimal withdrawIncome, Long id); } 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 0a84d485..44b076a5 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml @@ -20,7 +20,7 @@ user.total_income as income from mk_distribution_user user left join tb_shop_info shop on user.shop_id = shop.id - where user.shop_user_id = #{shopUserId} + where user.user_id = #{userId} and user.status = 1 and user.is_del = 0 @@ -36,9 +36,9 @@ CASE WHEN COUNT(shu.id) > 0 THEN 1 ELSE 0 END AS shopUser FROM tb_shop_info shop inner JOIN mk_distribution_config config ON shop.id = config.shop_id - LEFT JOIN mk_distribution_user du ON shop.id = du.shop_id AND du.user_id = #{user_id} AND du.is_del = 0 - LEFT JOIN tb_shop_user shu ON shop.id IN (shu.main_shop_id, shu.source_shop_id) AND shu.user_id = #{user_id} - LEFT JOIN tb_order_info ord ON shop.id = ord.shop_id AND ord.user_id = #{user_id} + LEFT JOIN mk_distribution_user du ON shop.id = du.shop_id AND du.user_id = #{userId} AND du.is_del = 0 + LEFT JOIN tb_shop_user shu ON shop.id IN (shu.main_shop_id, shu.source_shop_id) AND shu.user_id = #{userId} + LEFT JOIN tb_order_info ord ON shop.id = ord.shop_id AND ord.user_id = #{userId} AND ord.STATUS = 'done' GROUP BY shop.id