From bf93fddb3cc0f081e5a3819324a43fac1929e062 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Thu, 5 Nov 2020 11:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B4=BB=E5=8A=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE--=E5=90=8C=E6=AD=A5=E9=99=90=E5=88=B6=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E6=95=B0=E9=87=8F=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Forms/v3/GoodsActivityLimitForm.php | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Forms/v3/GoodsActivityLimitForm.php b/app/Admin/Forms/v3/GoodsActivityLimitForm.php
index 0333920..034ff35 100644
--- a/app/Admin/Forms/v3/GoodsActivityLimitForm.php
+++ b/app/Admin/Forms/v3/GoodsActivityLimitForm.php
@@ -20,15 +20,36 @@ class GoodsActivityLimitForm extends Form
     public function handle(array $input)
     {
         // 获取外部传递参数
-        $flashSale = $input['flash_sale'];
-        $groupBuy= $input['group_buy'];
-        $newProduct= $input['new_product'];
-        
         $data = [
-            'flash_sale' => $flashSale,
-            'group_buy' => $groupBuy,
-            'new_product' => $newProduct,
+            'flash_sale' => $input['flash_sale'] ?? 0,
+            'group_buy' => $input['group_buy'] ?? 0,
+            'new_product' => $input['new_product'] ?? 0,
+        ];
+        $setData = [
+            'buy_num_limit' => 0,
+            'banner' => '',
+            'show_type' => 'list',
+            'index_num_limit' => 6,
+            'index_image' => '',
+            'index_url' => '',
+        ];
+        $setting = Redis::hgetall(RedisKey::ACTIVITY_TYPE_SETTING);
+        $settingData = [
+            'flash_sale' => isset($setting['flash_sale']) ? json_decode($setting['flash_sale'],true) : $setData,
+            'group_buy' => isset($setting['group_buy']) ? json_decode($setting['group_buy'],true) : $setData,
+            'new_product' => isset($setting['new_product']) ? json_decode($setting['new_product'],true) : $setData,
+        ];
+        
+        $settingData['flash_sale']['buy_num_limit'] = $data['flash_sale'];
+        $settingData['group_buy']['buy_num_limit'] = $data['group_buy'];
+        $settingData['new_product']['buy_num_limit'] = $data['new_product'];
+
+        $activitySetting = [
+            'flash_sale' => json_encode($settingData['flash_sale']),
+            'group_buy' => json_encode($settingData['group_buy']),
+            'new_product' => json_encode($settingData['new_product']),
         ];
+        $res2 = Redis::hmset(RedisKey::ACTIVITY_TYPE_SETTING , $activitySetting);
 
         $res = Redis::hmset(RedisKey::ACTIVITY_TYPE_LIMIT_NUMS , $data);
         if($res){