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

!24 fix seckill abnormal open

Browse Source 
Merge pull request !24 from OceansDeep/feature/pg
This commit is contained in:
OceansDeep 2021-09-10 02:38:13 +00:00 committed by Gitee
commit 48a2502467
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java
View File

@ -188,6 +188,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
if (PromotionStatusEnum.START.name().equals(seckillVO.getPromotionStatus())) {
throw new ServiceException(ResultCode.PROMOTION_UPDATE_ERROR);
}
PromotionTools.checkPromotionTime(seckillVO.getStartTime().getTime(), seckillVO.getEndTime().getTime());
//更新到MYSQL中
boolean result = this.updateById(seckillVO);
//保存到MONGO中

8
framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java
View File

@ -1,10 +1,10 @@
package cn.lili.modules.promotion.tools;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.enums.PromotionTypeEnum;
import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.utils.DateUtil;
import cn.lili.common.vo.PageVO;
import cn.lili.modules.promotion.entity.dos.PromotionGoods;
import cn.lili.modules.promotion.entity.dto.BasePromotion;
@ -56,10 +56,10 @@ public class PromotionTools {
*/
public static void checkPromotionTime(Long startTime, Long endTime) {
long nowTime = DateUtil.getDateline() * 1000;
long nowTime = DateUtil.current();
//如果活动起始时间小于现在时间
if (startTime < nowTime) {
if (startTime < nowTime || endTime < nowTime) {
throw new ServiceException(ResultCode.PROMOTION_START_TIME_ERROR);
}
@ -92,7 +92,7 @@ public class PromotionTools {
i.or(i1 -> i1.le(startTimeColumn, endTime).ge(endTimeColumn, endTime));
});
} else {
queryWrapper.ge(startTimeColumn, cn.hutool.core.date.DateUtil.beginOfDay(startTime)).le(endTimeColumn, cn.hutool.core.date.DateUtil.endOfDay(endTime));
queryWrapper.ge(startTimeColumn, DateUtil.beginOfDay(startTime)).le(endTimeColumn, DateUtil.endOfDay(endTime));
}
if (storeId != null) {
queryWrapper.eq("store_id", storeId);