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

merge conflict origin/master

Browse Source
This commit is contained in:
paulGao
2022-02-09 16:52:28 +08:00
parent bbe3399c90 a4ee4df71b
commit 4dc183cdf5
6 changed files with 45 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
manager-api/src/main/java/cn/lili/controller/sms/SmsTemplateManagerController.java
View File

@@ -1,5 +1,6 @@
package cn.lili.controller.sms;
import cn.lili.common.aop.annotation.DemoSite;
import cn.lili.common.enums.ResultUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.common.vo.ResultMessage;
@@ -29,21 +30,24 @@ public class SmsTemplateManagerController {
@ApiOperation(value = "新增短信模板")
@PostMapping
@DemoSite
public ResultMessage<SmsTemplate> save(@Valid SmsTemplate smsTemplate) {
smsTemplateService.addSmsTemplate(smsTemplate);
return ResultUtil.success();
}
@ApiOperation(value = "删除短信模板")
@ApiImplicitParam(name = "id", value = "短信模板ID", required = true, paramType = "path")
@DeleteMapping("/{id}")
public ResultMessage<SmsTemplate> delete(@PathVariable("id") String id) {
smsTemplateService.deleteSmsTemplate(id);
@ApiImplicitParam(name = "templateCode", value = "短信模板CODE", required = true, paramType = "query")
@DeleteMapping
@DemoSite
public ResultMessage<SmsTemplate> delete(String templateCode) {
smsTemplateService.deleteSmsTemplate(templateCode);
return ResultUtil.success();
}
@ApiOperation(value = "查询短信模板状态")
@PutMapping("/querySmsSign")
@DemoSite
public ResultMessage<SmsTemplate> querySmsSign() {
smsTemplateService.querySmsTemplate();
return ResultUtil.success();
@@ -51,6 +55,7 @@ public class SmsTemplateManagerController {
@ApiOperation(value = "修改短信模板")
@PutMapping("/modifySmsTemplate")
@DemoSite
public ResultMessage<SmsTemplate> modifySmsTemplate(@Valid SmsTemplate smsTemplate) {
smsTemplateService.modifySmsTemplate(smsTemplate);
return ResultUtil.success();

9
manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java
View File

@@ -50,10 +50,11 @@ class SeckillTest {
System.out.println(setting);
SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
System.out.println(seckillSetting);
Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule());
System.out.println(seckill);
boolean result = seckillService.savePromotions(seckill);
System.out.println(result);
boolean result = true;
for (int i = 1; i <= SeckillService.PRE_CREATION; i++) {
Seckill seckill = new Seckill(i, seckillSetting.getHours(), seckillSetting.getSeckillRule());
seckillService.savePromotions(seckill);
}
Assertions.assertTrue(result);
}