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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-03-05 15:41:57 +08:00
parent 268b6a5b3a 6de7f4e044
commit abf153968e
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cash-service/account-service/src/main/resources/mapper/ShopActivateCouponRecordMapper.xml
View File

@@ -60,17 +60,13 @@
pro.id as proId, pro.id as proId,
inRecord.name as name, inRecord.name as name,
inRecord.type, inRecord.type,
inRecord.over_num as num,
inRecord.use_end_time as endTime inRecord.use_end_time as endTime
FROM FROM
tb_shop_activate_coupon_record inRecord tb_shop_activate_coupon_record inRecord
LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id
LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId} LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id and pro.shop_id = #{shopId}
WHERE WHERE
inRecord.shop_user_id in inRecord.shop_user_id = #{shopUserId}
<foreach item="item" index="index" collection="vipUserIds" open="(" separator="," close=")">
#{item}
</foreach>
<if test="shopId != null and shopId != ''"> <if test="shopId != null and shopId != ''">
and inRecord.shop_id = #{shopId} and inRecord.shop_id = #{shopId}
</if> </if>