From e574a6456ddff5e6a85a7275b5cfb53898d3551e Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Wed, 5 Nov 2025 17:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E6=89=93=E5=BC=80=E7=9A=84=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=20=E6=89=93=E5=BC=80=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=98=AF=E5=90=A6=E5=B7=B2=E5=BC=80=E5=90=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/market/vo/DistributionCenterShopVO.java | 2 +- .../src/main/resources/mapper/MkDistributionUserMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java index 51d7d694..145a73ff 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java @@ -21,7 +21,7 @@ public class DistributionCenterShopVO implements Serializable { //收益 private String income; //是否开启 - private Boolean isEnabled; + private Boolean isEnable; 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 10bfeaa6..178658ac 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml @@ -24,7 +24,7 @@ shop.shop_name as shopName, shop.address as shopAddress, user.total_income as income, - config.is_enabled as isEnabled + config.is_enable as isEnable from mk_distribution_user user left join tb_shop_info shop on user.shop_id = shop.id left JOIN mk_distribution_config config ON user.shop_id = config.shop_id @@ -43,7 +43,7 @@ COUNT(DISTINCT ord.id) AS orderCount, 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 and config.is_enabled = 1 + inner JOIN mk_distribution_config config ON shop.id = config.shop_id and config.is_enable = 1 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}