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:08:18 +08:00
parent 44636808d9 e574a6456d
commit 5b520fa0ea
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ public class DistributionCenterShopVO implements Serializable {
//收益 //收益
private String income; private String income;
//是否开启 //是否开启
private Boolean isEnabled; private Boolean isEnable;

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

@ -24,7 +24,7 @@
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 config.is_enable as isEnable
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 left JOIN mk_distribution_config config ON user.shop_id = config.shop_id
@ -43,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 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 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}