From 5d8d41392c069017a00295894a658ef763222d70 Mon Sep 17 00:00:00 2001
From: Yao <734770036@qq.com>
Date: Thu, 26 Sep 2024 17:36:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/groupbuy/group_buy/edit.html | 10 +++++-----
 app/api/logic/GoodsLogic.php                |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/admin/view/groupbuy/group_buy/edit.html b/app/admin/view/groupbuy/group_buy/edit.html
index 98fdaef7..3393f5f6 100644
--- a/app/admin/view/groupbuy/group_buy/edit.html
+++ b/app/admin/view/groupbuy/group_buy/edit.html
@@ -23,11 +23,11 @@
         </colgroup>
         <thead>
         <tr style="background-color: #f3f5f9">
-          <th style="width: 120px;text-align: center">商品</th>
-          <th style="width: 120px;text-align: center">商品规格</th>
-          <th style="width: 60px;text-align: center">商品价格</th>
-          <th style="width: 30px;text-align: center">抢购价格</th>
-          <th style="width: 30px;text-align: center">库存</th>
+          <th style="width: 240px;text-align: center">商品</th>
+          <th style="width: 240px;text-align: center">商品规格</th>
+          <th style="width: 120px;text-align: center">商品价格</th>
+          <th style="width: 120px;text-align: center">抢购价格</th>
+          <th style="width: 120px;text-align: center">库存</th>
         </tr>
         </thead>
         <tbody>
diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index 2340c0c6..77cec2ac 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -100,8 +100,11 @@ class GoodsLogic extends Logic
 
             // 转数组
             $goodsDetailArr = $goodsDetail->toArray();
-            $goodsDetailArr['poster'] = !empty($goodsDetailArr['poster']) ? UrlServer::getFileUrl($goodsDetailArr['poster']) : '';
 
+            $goodsDetailArr['poster'] = !empty($goodsDetailArr['poster']) ? UrlServer::getFileUrl($goodsDetailArr['poster']) : '';
+            foreach ($goodsDetailArr['goods_item'] as &$valItem){
+                $valItem['limited_num'] = 0;
+            }
             // 新增点击记录
             GoodsClick::create([
                 'shop_id' => $goodsDetailArr['shop_id'],
@@ -212,6 +215,7 @@ class GoodsLogic extends Logic
                 'type' => 0,
                 'type_desc' => '普通商品'
             ];
+
             // 检查商品是否在参与活动，替换商品价格
             $goodsDetailArr = self::checkActivity($goodsDetailArr);
             // 检查商品是否参与抢购活动，替换商品价格、库存。
@@ -1084,7 +1088,7 @@ class GoodsLogic extends Logic
                 // 获取该商品的秒杀信息
                 $GroupbuyGoods_info = GroupbuyGoods::where([
                     'goods_id' => $goods['id'],
-                ])->column('goods_id,item_id,activity_price,stock', 'item_id');
+                ])->column('goods_id,item_id,activity_price,stock,limited_num', 'item_id');
 
         }
 
@@ -1106,6 +1110,7 @@ class GoodsLogic extends Logic
             $item['price'] = $GroupbuyGoods_info[$item['id']]['activity_price'];
             // SKU库存替换抢购库存
             $item['stock'] = $GroupbuyGoods_info[$item['id']]['stock'];
+            $item['limited_num'] =$GroupbuyGoods_info[$item['id']]['limited_num'];
         }
 
         $goods['activity'] = [