From 9fde3c55d7c076750390c7cefe5c2f00c897cc77 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Fri, 29 Nov 2024 14:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B4=BB=E5=8A=A8=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=95=86=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 2d4d7490..6a795e6e 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -111,7 +111,6 @@ class GoodsLogic extends Logic
 
             // 转数组
             $goodsDetailArr = $goodsDetail->toArray();
-
             $goodsDetailArr['poster'] = !empty($goodsDetailArr['poster']) ? UrlServer::getFileUrl($goodsDetailArr['poster']) : '';
             foreach ($goodsDetailArr['goods_item'] as &$valItem){
                 $valItem['limited_num'] = 0;
@@ -1165,21 +1164,21 @@ class GoodsLogic extends Logic
 //        ];
 
         // 2024-11-29 更改规则：活动中的每件商品用户都能购买，但是只能买一件
-        $goods = Order::alias('a')
+        $in_activity = Order::alias('a')
             ->join('order_goods og', 'a.id = og.order_id')
             ->where(['a.user_id' => $userId, 'a.order_type' => 4, 'og.goods_id' => $goods['id']])
             ->where('a.order_status', '<', 4)
             ->find();
 
-        if (!empty($goods)) {
+        if (!empty($in_activity)) {
             $goods['activity'] = [
                 'type' => 4,
                 'type_desc' => '抢购商品',
                 'in_groupbuy_activity' => true,
                 'msg' => '您已购买过改商品！'
             ];
-
-            return $goods;
         }
+
+        return $goods;
     }
 }