From a834326805b2ca86c54437a22bb41a23eceace3f Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Fri, 10 Nov 2023 18:08:43 +0800
Subject: [PATCH] Merge branch 'blnka' of http://120.27.238.55:7000/r/xc-mall into blnka
---
src/main/resources/mapper/modules/MallMemberCouponMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index 20e28d8..59fa15e 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -8,7 +8,7 @@
b.cost_amount costAmount,
b.real_amount realAmount
from mall_member_coupon a
- left join mall_goods_coupon b on b.id = a.coupon_id
+ INNER join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
<where>
a.member_id=#{record.memberId}
<if test="record.state == 1">
@@ -43,6 +43,17 @@
where a.member_id = #{memberId}
and a.goods_id = #{goodsId}
and a.coupon_id = #{couponId}
+ and a.invite_id = #{inviteId}
+ and a.state = 1
+ </select>
+
+ <select id="selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId" resultType="cc.mrbird.febs.mall.entity.MallMemberCoupon">
+ select
+ a.*
+ from mall_member_coupon a
+ where a.member_id = #{memberId}
+ and a.goods_id = #{goodsId}
+ and a.state = 1
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1