From 57b8fcb03b1c3f1c66cfbdf3f801ff1ff43d7928 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Mon, 30 Sep 2024 15:13:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=94=A8=E6=88=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=8F=82=E4=B8=8E=E4=BA=86=E6=8A=A2=E8=B4=AD=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E7=9A=84=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/GoodsLogic.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 5f774bd4..c0ca3147 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -6,6 +6,7 @@ namespace app\api\logic;
 use app\common\model\distribution\Distribution;
 use app\common\model\distribution\DistributionLevel;
 use app\common\model\goods\GoodsCategory;
+use app\common\model\order\Order;
 use app\common\model\procurement\Mprocurement;
 use app\common\model\procurement\Procurementset;
 use app\common\model\shop\ShopFollow;
@@ -219,7 +220,7 @@ class GoodsLogic extends Logic
             // 检查商品是否在参与活动，替换商品价格
             $goodsDetailArr = self::checkActivity($goodsDetailArr);
             // 检查商品是否参与抢购活动，替换商品价格、库存。
-            $goodsDetailArr = self::rushBuy($goodsDetailArr);
+            $goodsDetailArr = self::rushBuy($goodsDetailArr, $userId);
             // 是否收藏
             $goodsDetailArr['is_collect'] = 0;
             if($userId) { // 非游客
@@ -1070,7 +1071,7 @@ class GoodsLogic extends Logic
         }
     }
 
-    public static function rushBuy($goods){
+    public static function rushBuy($goods, $userId){
 
         // 判断是否是抢购中的商品
         $GroupbuyGoods = GroupbuyGoods::where([
@@ -1113,9 +1114,13 @@ class GoodsLogic extends Logic
             $item['limited_num'] =$GroupbuyGoods_info[$item['id']]['limited_num'];
         }
 
+        // 如果当前用户参与了抢购的活动（则不允许再次抢购）
+        $in_activity = Order::where('user_id', $userId)->where('order_status', '<', 4)->find();
+
         $goods['activity'] = [
             'type' => 4,
             'type_desc' => '抢购商品',
+            'in_activity' => $in_activity
         ];
         return $goods;