From de369b4b3d87a5c1e4c8848c5b0d75fbac45459f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 26 Feb 2024 10:39:43 +0800 Subject: [PATCH] Merge branch 'blnka-vip' into blnka --- src/main/resources/mapper/modules/MallMemberCouponMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml index ee8fdb9..ecde786 100644 --- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml +++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml @@ -6,7 +6,8 @@ select a.*, b.cost_amount costAmount, - b.real_amount realAmount + b.real_amount realAmount, + b.type type from mall_member_coupon a INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2 <where> @@ -32,6 +33,7 @@ select a.*, b.cost_amount costAmount, + b.type type, b.real_amount realAmount from mall_member_coupon a INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2 -- Gitblit v1.9.1