From 9967ee263f35bbc1a997e212fb0cd1a7ab6b1d91 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 Oct 2023 10:04:26 +0800
Subject: [PATCH] 一个商品领取一张卷,

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml                 |   10 ++++++++++
 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java         |    4 ++++
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    3 ++-
 3 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
index 75480e9..e49da4d 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
@@ -20,4 +20,8 @@
                                                                      @Param("goodsId")Long goodsId,
                                                                      @Param("couponId")Long couponId,
                                                                      @Param("inviteId")String inviteId);
+
+    List<MallMemberCoupon> selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(@Param("memberId")Long memberId,
+                                                                     @Param("goodsId")Long goodsId,
+                                                                     @Param("couponId")Long couponId);
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 6668109..e4397ad 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -893,7 +893,8 @@
             if(ObjectUtil.isNotEmpty(salemanCoupon)){
                 Long couponId = salemanCoupon.getCouponId();
                 Long goodsId = getCouponDto.getGoodsId();
-                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponId(memberId, goodsId, couponId,mallMember.getInviteId());
+//                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponId(memberId, goodsId, couponId,mallMember.getInviteId());
+                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId, couponId);
                 if(CollUtil.isEmpty(mallMemberCoupons)){
                     //商品优惠卷如果绑定了,那么当前登陆者获取一张卷
                     List<CouponGoods> couponGoodsList = couponGoodsMapper.selectByGoodIdAndCouponId(goodsId,couponId);
diff --git a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
index ec06208..480eb73 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -47,4 +47,14 @@
         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.coupon_id = #{couponId}
+        and a.state = 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1