From d9ccc4a7b772e2e49b9284d02f8e84c26552a2d4 Mon Sep 17 00:00:00 2001
From: lifenlong <pikachu1995@126.com>
Date: Tue, 25 May 2021 08:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A7=92=E6=9D=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/system/entity/enums/SettingEnum.java   |  4 ++--
 .../setting/SettingManagerController.java          | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
index bf618c05..23c8fbda 100644
--- a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
+++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
@@ -29,7 +29,7 @@ public enum SettingEnum {
     POINT_SETTING,
     //经验值设置
     EXPERIENCE_SETTING,
-    //经验值设置
+    //秒杀活动设置
     SECKILL_SETTING,
 
     //微信 联合登陆设置
@@ -42,5 +42,5 @@ public enum SettingEnum {
     //支付宝支付设置
     ALIPAY_PAYMENT,
     //微信支付设置
-    WECHAT_PAYMENT,
+    WECHAT_PAYMENT;
 }
diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
index c60b586c..534765f0 100644
--- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
+++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
@@ -115,7 +115,6 @@ public class SettingManagerController {
                 return setting == null ?
                         ResultUtil.data(new BaseSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), BaseSetting.class));
-
             case WITHDRAWAL_SETTING:
                 return setting == null ?
                         ResultUtil.data(new WithdrawalSetting()) :
@@ -124,7 +123,6 @@ public class SettingManagerController {
                 return setting == null ?
                         ResultUtil.data(new DistributionSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class));
-
             case EMAIL_SETTING:
                 return setting == null ?
                         ResultUtil.data(new EmailSetting()) :
@@ -141,46 +139,42 @@ public class SettingManagerController {
                 return setting == null ?
                         ResultUtil.data(new OrderSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class));
-
             case OSS_SETTING:
                 return setting == null ?
                         ResultUtil.data(new OssSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OssSetting.class));
-
             case SMS_SETTING:
                 return setting == null ?
                         ResultUtil.data(new SmsSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), SmsSetting.class));
-
             case POINT_SETTING:
                 return setting == null ?
                         ResultUtil.data(new PointSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PointSetting.class));
-
             case QQ_CONNECT:
                 return setting == null ?
                         ResultUtil.data(new QQConnectSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), QQConnectSetting.class));
-
             case PAYMENT_SUPPORT:
                 return setting == null ?
                         ResultUtil.data(new PaymentSupportSetting(new PaymentSupportForm())) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PaymentSupportSetting.class));
-
             case ALIPAY_PAYMENT:
                 return setting == null ?
                         ResultUtil.data(new AlipayPaymentSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), AlipayPaymentSetting.class));
-
             case WECHAT_CONNECT:
                 return setting == null ?
                         ResultUtil.data(new WechatConnectSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class));
-
             case WECHAT_PAYMENT:
                 return setting == null ?
                         ResultUtil.data(new WechatPaymentSetting()) :
                         ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), WechatPaymentSetting.class));
+            case SECKILL_SETTING:
+                return setting == null ?
+                        ResultUtil.data(new SeckillSetting()) :
+                        ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), SeckillSetting.class));
             default:
                 throw new ServiceException(ResultCode.SETTING_NOT_TO_SET);
         }