获取活动中的商品

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;
     }
 }