From 6526413b328333a0fe5c789ab902355c8dfca5e6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 06 Jun 2022 10:17:18 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java               |    2 +-
 src/main/resources/mapper/modules/MallOrderItemMapper.xml                       |    2 +-
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
index eb07282..bd72853 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
@@ -8,5 +8,5 @@
 
 public interface MallOrderItemMapper extends BaseMapper<MallOrderItem> {
 
-    List<MallOrderItem> selectItemByGoodsIdUnCancel(@Param("goodsId") Long goodsId);
+    List<MallOrderItem> selectItemByGoodsIdUnCancel(@Param("goodsId") Long goodsId, @Param("memberId") Long memberId);
 }
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index f8c4036..d34fa87 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -131,7 +131,7 @@
 
                 // 零撸专区购买
                 if (new BigDecimal(mallGoods.getPresentPrice()).compareTo(BigDecimal.ZERO) == 0) {
-                    List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId());
+                    List<MallOrderItem> items = mallOrderItemMapper.selectItemByGoodsIdUnCancel(mallGoods.getId(), member.getId());
                     if (CollUtil.isNotEmpty(items)) {
                         throw new FebsException("无法重复领取同一个商品");
                     }
diff --git a/src/main/resources/mapper/modules/MallOrderItemMapper.xml b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
index 18159ef..ccd5024 100644
--- a/src/main/resources/mapper/modules/MallOrderItemMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
@@ -5,7 +5,7 @@
     <select id="selectItemByGoodsIdUnCancel" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
         select a.* from mall_order_item a
             inner join mall_order_info b on a.order_id=b.ID and b.status in (1,2,3,4)
-        where a.goods_id=#{goodsId}
+        where a.goods_id=#{goodsId} and b.member_id=#{}
     </select>
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1