From a24edc2ac57f8f06b5720c3e5fe2b7b427a27cb4 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Thu, 28 Nov 2024 16:59:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A5=BD=E7=89=A9=E7=9B=B4=E9=99=8D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/groupbuy/GroupBuy.php |  1 -
 app/admin/logic/groupbuy/GroupbuyLogic.php |  3 +--
 app/api/controller/GroupBuyGoods.php       |  3 +--
 app/api/logic/GroupBuyLogic.php            | 24 ++++++++++++++--------
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/admin/controller/groupbuy/GroupBuy.php b/app/admin/controller/groupbuy/GroupBuy.php
index 1cada966..ab3b0223 100644
--- a/app/admin/controller/groupbuy/GroupBuy.php
+++ b/app/admin/controller/groupbuy/GroupBuy.php
@@ -4,7 +4,6 @@ namespace app\admin\controller\groupbuy;
 
 use app\common\basics\AdminBase;
 
-use app\common\model\groupbuy\GroupbuyConfig;
 use app\common\server\JsonServer;
 use app\admin\logic\groupbuy\GroupbuyLogic;
 use app\admin\validate\groupbuy\GroupbuyValidate;
diff --git a/app/admin/logic/groupbuy/GroupbuyLogic.php b/app/admin/logic/groupbuy/GroupbuyLogic.php
index e4f41435..8021ad0e 100644
--- a/app/admin/logic/groupbuy/GroupbuyLogic.php
+++ b/app/admin/logic/groupbuy/GroupbuyLogic.php
@@ -42,6 +42,7 @@ class GroupbuyLogic extends Logic
                 'var_page' => 'page'
             ])
             ->toArray();
+
         if($lists){
             foreach ($lists['data'] as &$item){
                $item['goods_image'] =  UrlServer::getFileUrl($item['goods_image']);
@@ -50,8 +51,6 @@ class GroupbuyLogic extends Logic
         }
 
         return ['count'=>$lists['total'], 'lists'=>$lists['data']];
-
-
     }
 
     public static function add($post){
diff --git a/app/api/controller/GroupBuyGoods.php b/app/api/controller/GroupBuyGoods.php
index 8824c066..067b333b 100644
--- a/app/api/controller/GroupBuyGoods.php
+++ b/app/api/controller/GroupBuyGoods.php
@@ -8,7 +8,7 @@ use app\common\server\JsonServer;
 
 class GroupBuyGoods  extends Api
 {
-    public $like_not_need_login = ['getGroupBuyGoods',];
+    public $like_not_need_login = ['getGroupBuyGoods'];
 
     /**
      * @return void
@@ -23,7 +23,6 @@ class GroupBuyGoods  extends Api
         $data = GroupBuyLogic::getGroupBuyGoods($get);
 
         return JsonServer::success('', $data);
-
     }
 
 }
\ No newline at end of file
diff --git a/app/api/logic/GroupBuyLogic.php b/app/api/logic/GroupBuyLogic.php
index 4d32ac7b..3c5cf7e7 100644
--- a/app/api/logic/GroupBuyLogic.php
+++ b/app/api/logic/GroupBuyLogic.php
@@ -5,6 +5,7 @@ namespace app\api\logic;
 use app\common\basics\Logic;
 use app\common\model\groupbuy\GroupbuyGoods;
 use app\common\server\UrlServer;
+use app\common\model\groupbuy\GroupbuyConfig;
 
 class GroupBuyLogic extends Logic
 {
@@ -42,23 +43,28 @@ class GroupBuyLogic extends Logic
         foreach($lists as &$item) {
             // 图片加域名
             $item['goods_image'] = UrlServer::getFileUrl($item['goods_image']);
-
         }
         $lists = [];
+
+        $data = GroupbuyConfig::select();
+        $config = array();
+        if (!empty($data)) {
+            $result = $data->toArray();
+            foreach ($result as &$v) {
+                if ($v['name'] == 'service') {
+                    $v['value'] = explode(',', $v['value']);
+                }
+                $config[$v['name']] = $v['value'];
+            }
+        }
+
         return [
             'count' => $count,
             'lists' => $lists,
             'page_no' => $get['page_no'],
             'page_size' => $get['page_size'],
             'more' => is_more($count, $get['page_no'], $get['page_size']),
-            'rule'=>'抢购规则：<br/>
-                    1、抢购活动时间：10月1号至10月7号；<br/>
-                    2、抢购场次：活动期内每天上午12点及晚上8点各一场，抢完即止；<br/>
-                    3、抢购权限：活动期间内每人及每个身份证只能抢购一次；<br/>
-                    4、确认抢购成功条件：以付款成功为确认抢购成功；抢购成功后5分钟内不支付款项的，则视为放弃。<br/>
-                    5、抢购活动产生的订单也参与平台消费返补活动；<br/>
-                    6、所有抢购成功并支付款项的，对应抢购商品统一于节后全部发出，运费自付！<br/>
-                    7、抢购商品，非质量问题，不接受退货！'
+            'config' => $config,
         ];
 
     }