caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加秒杀活动设置

Browse Source
This commit is contained in:
lifenlong 2021-05-25 08:29:07 +08:00
parent 116a52ea14
commit d9ccc4a7b7
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java
View File

@ -29,7 +29,7 @@ public enum SettingEnum {
POINT_SETTING, POINT_SETTING,
//经验值设置 //经验值设置
EXPERIENCE_SETTING, EXPERIENCE_SETTING,
//经验值设置 //秒杀活动设置
SECKILL_SETTING, SECKILL_SETTING,
//微信 联合登陆设置 //微信 联合登陆设置
@ -42,5 +42,5 @@ public enum SettingEnum {
//支付宝支付设置 //支付宝支付设置
ALIPAY_PAYMENT, ALIPAY_PAYMENT,
//微信支付设置 //微信支付设置
WECHAT_PAYMENT, WECHAT_PAYMENT;
} }

14
manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java
View File

@ -115,7 +115,6 @@ public class SettingManagerController {
return setting == null ? return setting == null ?
ResultUtil.data(new BaseSetting()) : ResultUtil.data(new BaseSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), BaseSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), BaseSetting.class));
case WITHDRAWAL_SETTING: case WITHDRAWAL_SETTING:
return setting == null ? return setting == null ?
ResultUtil.data(new WithdrawalSetting()) : ResultUtil.data(new WithdrawalSetting()) :
@ -124,7 +123,6 @@ public class SettingManagerController {
return setting == null ? return setting == null ?
ResultUtil.data(new DistributionSetting()) : ResultUtil.data(new DistributionSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), DistributionSetting.class));
case EMAIL_SETTING: case EMAIL_SETTING:
return setting == null ? return setting == null ?
ResultUtil.data(new EmailSetting()) : ResultUtil.data(new EmailSetting()) :
@ -141,46 +139,42 @@ public class SettingManagerController {
return setting == null ? return setting == null ?
ResultUtil.data(new OrderSetting()) : ResultUtil.data(new OrderSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OrderSetting.class));
case OSS_SETTING: case OSS_SETTING:
return setting == null ? return setting == null ?
ResultUtil.data(new OssSetting()) : ResultUtil.data(new OssSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OssSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), OssSetting.class));
case SMS_SETTING: case SMS_SETTING:
return setting == null ? return setting == null ?
ResultUtil.data(new SmsSetting()) : ResultUtil.data(new SmsSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), SmsSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), SmsSetting.class));
case POINT_SETTING: case POINT_SETTING:
return setting == null ? return setting == null ?
ResultUtil.data(new PointSetting()) : ResultUtil.data(new PointSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PointSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PointSetting.class));
case QQ_CONNECT: case QQ_CONNECT:
return setting == null ? return setting == null ?
ResultUtil.data(new QQConnectSetting()) : ResultUtil.data(new QQConnectSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), QQConnectSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), QQConnectSetting.class));
case PAYMENT_SUPPORT: case PAYMENT_SUPPORT:
return setting == null ? return setting == null ?
ResultUtil.data(new PaymentSupportSetting(new PaymentSupportForm())) : ResultUtil.data(new PaymentSupportSetting(new PaymentSupportForm())) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PaymentSupportSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), PaymentSupportSetting.class));
case ALIPAY_PAYMENT: case ALIPAY_PAYMENT:
return setting == null ? return setting == null ?
ResultUtil.data(new AlipayPaymentSetting()) : ResultUtil.data(new AlipayPaymentSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), AlipayPaymentSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), AlipayPaymentSetting.class));
case WECHAT_CONNECT: case WECHAT_CONNECT:
return setting == null ? return setting == null ?
ResultUtil.data(new WechatConnectSetting()) : ResultUtil.data(new WechatConnectSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class)); ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class));
case WECHAT_PAYMENT: case WECHAT_PAYMENT:
return setting == null ? return setting == null ?
ResultUtil.data(new WechatPaymentSetting()) : ResultUtil.data(new WechatPaymentSetting()) :
ResultUtil.data(JSONUtil.toBean(setting.getSettingValue(), WechatPaymentSetting.class)); 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: default:
throw new ServiceException(ResultCode.SETTING_NOT_TO_SET); throw new ServiceException(ResultCode.SETTING_NOT_TO_SET);
} }