czg_team/wx-cashier-service
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优惠券 返回名称

Browse Source
This commit is contained in:
wangw
2024-11-13 17:28:52 +08:00
parent 3d28ec44d7
commit 7ee00caf7e
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/chaozhanggui/system/cashierservice/entity/vo/TbUserCouponVo.java
View File

@@ -9,6 +9,7 @@ import java.util.Date;
public class TbUserCouponVo { public class TbUserCouponVo {
private Integer id; private Integer id;
private Integer shopId; private Integer shopId;
private String shopName;
private BigDecimal fullAmount; private BigDecimal fullAmount;
private BigDecimal discountAmount; private BigDecimal discountAmount;
private Integer couponId; private Integer couponId;

4
src/main/resources/mapper/TbActivateInRecordMapper.xml
View File

@@ -39,6 +39,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
<select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo"> <select id="queryByVipIdAndShopId" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
SELECT SELECT
inRecord.shop_id as shopId, inRecord.shop_id as shopId,
shop.shop_name as shopName,
inRecord.id as id, inRecord.id as id,
inRecord.full_amount as fullAmount, inRecord.full_amount as fullAmount,
inRecord.discount_amount as discountAmount, inRecord.discount_amount as discountAmount,
@@ -54,6 +55,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
inRecord.use_end_time as endTime inRecord.use_end_time as endTime
FROM FROM
tb_activate_in_record inRecord tb_activate_in_record inRecord
LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id
LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id
<if test="shopId != null and shopId != ''"> <if test="shopId != null and shopId != ''">
and pro.shop_id = #{shopId} and pro.shop_id = #{shopId}
@@ -75,6 +77,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
<select id="queryByVipIdAndShopIdExpire" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo"> <select id="queryByVipIdAndShopIdExpire" resultType="com.chaozhanggui.system.cashierservice.entity.vo.TbUserCouponVo">
SELECT SELECT
inRecord.shop_id as shopId, inRecord.shop_id as shopId,
shop.shop_Name as shopName,
CASE CASE
WHEN inRecord.type = 1 THEN inRecord.NAME WHEN inRecord.type = 1 THEN inRecord.NAME
WHEN inRecord.type = 2 THEN pro.NAME WHEN inRecord.type = 2 THEN pro.NAME
@@ -84,6 +87,7 @@ id, vip_user_id, coupon_id, name, type, pro_id, full_amount, discount_amount, nu
inRecord.use_end_time as endTime inRecord.use_end_time as endTime
FROM FROM
tb_activate_in_record inRecord tb_activate_in_record inRecord
LEFT JOIN tb_shop_info shop ON inRecord.shop_id = shop.id
LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id LEFT JOIN tb_product pro ON inRecord.pro_id = pro.id
<if test="shopId != null and shopId != ''"> <if test="shopId != null and shopId != ''">
and pro.shop_id = #{shopId} and pro.shop_id = #{shopId}