czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into prod

This commit is contained in:
wangw 2025-11-05 17:02:42 +08:00
parent 02cea05706 c1b15950ba
commit 17e58f9158
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cash-common/cash-common-service/src/main/java/com/czg/market/vo/DistributionCenterShopVO.java
View File

@ -20,6 +20,10 @@ public class DistributionCenterShopVO implements Serializable {
private String shopAddress; private String shopAddress;
//收益 //收益
private String income; private String income;
//是否开启
private Boolean isEnabled;
//标签内容 //标签内容
private String labelContent; private String labelContent;

6
cash-service/market-service/src/main/resources/mapper/MkDistributionUserMapper.xml
View File

@ -23,9 +23,11 @@
shop.cover_img as coverImg, shop.cover_img as coverImg,
shop.shop_name as shopName, shop.shop_name as shopName,
shop.address as shopAddress, shop.address as shopAddress,
user.total_income as income user.total_income as income,
config.is_enabled as isEnabled
from mk_distribution_user user from mk_distribution_user user
left join tb_shop_info shop on user.shop_id = shop.id 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
where user.user_id = #{userId} where user.user_id = #{userId}
and user.status > 0 and user.status > 0
and user.is_del = 0 and user.is_del = 0
@ -41,7 +43,7 @@
COUNT(DISTINCT ord.id) AS orderCount, COUNT(DISTINCT ord.id) AS orderCount,
CASE WHEN COUNT(shu.id) > 0 THEN 1 ELSE 0 END AS shopUser CASE WHEN COUNT(shu.id) > 0 THEN 1 ELSE 0 END AS shopUser
FROM tb_shop_info shop FROM tb_shop_info shop
inner JOIN mk_distribution_config config ON shop.id = config.shop_id inner JOIN mk_distribution_config config ON shop.id = config.shop_id and config.is_enabled = 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 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 LEFT JOIN tb_shop_user shu
ON shop.id IN (shu.main_shop_id, shu.source_shop_id) AND shu.user_id = #{userId} ON shop.id IN (shu.main_shop_id, shu.source_shop_id) AND shu.user_id = #{userId}