code-image-backup-public/lilishop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加秒杀活动设置

Browse Source
This commit is contained in:
lifenlong
2021-06-02 17:30:32 +08:00
parent b2d149c714
commit 07b9e413d6
8 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java
View File

@@ -67,10 +67,8 @@ public class SeckillManagerController {
@ApiOperation(value = "分页查询秒杀活动列表")
@GetMapping
public ResultMessage<IPage<SeckillVO>> getAll(SeckillSearchParams param, PageVO pageVo) {
pageVo.setNotConvert(true);
IPage<SeckillVO> page = seckillService.getSeckillByPageFromMongo(param, pageVo);
return ResultUtil.data(page);
public ResultMessage<IPage<Seckill>> getAll(SeckillSearchParams param, PageVO pageVo) {
return ResultUtil.data(seckillService.getSeckillByPageFromMysql(param, pageVo));
}
@ApiOperation(value = "删除一个秒杀活动")

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

@@ -46,7 +46,7 @@ public class SettingManagerController {
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," +
"PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT")
"PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING")
public ResultMessage saveConfig(@PathVariable String key, @RequestBody String configValue) {
SettingEnum settingEnum = SettingEnum.valueOf(key);
//获取系统配置
@@ -92,7 +92,7 @@ public class SettingManagerController {
"WECHAT_PC_CONNECT,WECHAT_WAP_CONNECT,WECHAT_APP_CONNECT,WECHAT_MP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT," +
"QQ_WEB_CONNECT,QQ_APP_CONNECT,WEIBO_CONNECT,ALIPAY_CONNECT," +
"PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT"
"PAYMENT_SUPPORT,ALIPAY_PAYMENT,WECHAT_PAYMENT,SECKILL_SETTING"
)
public ResultMessage settingGet(@PathVariable String key) {
return createSetting(key);

2
manager-api/src/main/resources/manager.xml
View File

@@ -6,7 +6,7 @@
<!--应用名称-->
<property name="APP_NAME" value="common-api"/>
<!--日志文件保存路径-->
<property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/>
<property name="LOG_FILE_PATH" value="lili-logs"/>
<contextName>${APP_NAME}</contextName>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">