From 91983578388465b347c9fd1218a9491773351775 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 16 Oct 2023 14:27:30 +0800
Subject: [PATCH] 一个商品领取一张卷,

---
 src/main/resources/mapper/modules/MallMemberCouponMapper.xml                 |    1 -
 src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java         |    3 +--
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java |    3 ++-
 3 files changed, 3 insertions(+), 4 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 e49da4d..1315256 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallMemberCouponMapper.java
@@ -22,6 +22,5 @@
                                                                      @Param("inviteId")String inviteId);
 
     List<MallMemberCoupon> selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(@Param("memberId")Long memberId,
-                                                                     @Param("goodsId")Long goodsId,
-                                                                     @Param("couponId")Long couponId);
+                                                                     @Param("goodsId")Long goodsId;
 }
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 e4397ad..fd30d7e 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
@@ -894,7 +894,8 @@
                 Long couponId = salemanCoupon.getCouponId();
                 Long goodsId = getCouponDto.getGoodsId();
 //                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponId(memberId, goodsId, couponId,mallMember.getInviteId());
-                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId, couponId);
+//                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId, couponId);
+                List<MallMemberCoupon> mallMemberCoupons = mallMemberCouponMapper.selectListByMemberIdAndGoodsIdAndCouponIdWithOutInviteId(memberId, goodsId);
                 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 480eb73..d86f715 100644
--- a/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberCouponMapper.xml
@@ -53,7 +53,6 @@
         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>
 

--
Gitblit v1.9.1