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

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);
}