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

Merge remote-tracking branch 'origin/test' into test

This commit is contained in:
张松 2025-11-06 10:46:24 +08:00
parent d96d692b61 ac904d0c19
commit 9a568fe1e3
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
View File

@ -281,8 +281,8 @@
u.head_img AS headImg, u.head_img AS headImg,
u.nick_name AS shopUserName, u.nick_name AS shopUserName,
u.phone AS shopUserPhone, u.phone AS shopUserPhone,
u.one_income AS oneIncome, invite.one_income AS oneIncome,
u.invite_time AS inviteTime, invite.invite_time AS inviteTime,
dist.total_income AS totalIncome, dist.total_income AS totalIncome,
dist.pending_income AS pendingIncome, dist.pending_income AS pendingIncome,
dist.received_income AS receivedIncome, dist.received_income AS receivedIncome,
@ -291,8 +291,9 @@
dist.distribution_level_id AS levelId, dist.distribution_level_id AS levelId,
dist.distribution_level_name AS levelName, dist.distribution_level_name AS levelName,
u.distribution_shops AS distributionShops u.distribution_shops AS distributionShops
FROM `tb_shop_user` as u FROM tb_shop_user_invite invite
left join mk_distribution_user dist on u.id = dist.id left join tb_shop_user u on invite.shop_user_id = u.id
left join mk_distribution_user dist on u.id = dist.id
WHERE u.`distribution_user_id` = #{distributionUserId} WHERE u.`distribution_user_id` = #{distributionUserId}
<if test="distributionLevelId != null">and dist.distribution_level_id = #{distributionLevelId}</if> <if test="distributionLevelId != null">and dist.distribution_level_id = #{distributionLevelId}</if>
<if test="shopUserId != null">and u.id = #{shopUserId}</if> <if test="shopUserId != null">and u.id = #{shopUserId}</if>