From 43c263df4d8ce0cc830f287780c29db8a2b47f0f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 27 五月 2024 08:44:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java | 144 +++++++----------------------------------------
1 files changed, 23 insertions(+), 121 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
index b41c374..8cf04e0 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSeckillServiceImpl.java
@@ -4,32 +4,29 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.enums.StartStatusEnum;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.common.redis.service.RedisService;
-import com.ruoyi.goods.controller.management.DTO.GoodsSeckillDTO;
-import com.ruoyi.goods.controller.management.DTO.GoodsSeckillQuery;
-import com.ruoyi.goods.controller.management.DTO.GoodsSeckillUpd;
-import com.ruoyi.goods.controller.management.VO.GoodsSeckillVO;
+import com.ruoyi.goods.controller.management.dto.GoodsSeckillDTO;
+import com.ruoyi.goods.controller.management.dto.GoodsSeckillQuery;
+import com.ruoyi.goods.controller.management.dto.GoodsSeckillUpd;
+import com.ruoyi.goods.controller.management.vo.GoodsSeckillVO;
import com.ruoyi.goods.mapper.GoodsSeckillMapper;
import com.ruoyi.goods.service.IGoodsSeckillService;
import com.ruoyi.goods.service.IGoodsSkuService;
-import com.ruoyi.system.api.constants.DelayTaskEnum;
-import com.ruoyi.system.api.domain.DelayTask;
+import com.ruoyi.goods.service.async.AsyncMethodService;
+import com.ruoyi.system.api.WebSocketUsers;
import com.ruoyi.system.api.domain.GoodsSeckill;
import com.ruoyi.system.api.domain.GoodsSku;
import com.ruoyi.system.api.domain.dto.ListStatusDTO;
import com.ruoyi.system.api.feignClient.OrderClient;
import com.ruoyi.system.api.feignClient.SysUserClient;
-import java.time.Duration;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
-import java.util.concurrent.TimeUnit;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,8 +47,7 @@
private final OrderClient orderClient;
private final RedisService redisService;
private final SysUserClient sysUserClient;
- private final RedissonClient redissonClient;
-
+ private final AsyncMethodService asyncMethodService;
@Override
@Transactional(rollbackFor = Exception.class)
public void addGoodsSeckill(GoodsSeckillDTO dto) {
@@ -67,117 +63,19 @@
this.saveBatch(goodsSeckills);
for (GoodsSeckill goodsSeckill : goodsSeckills) {
- LocalDateTime startTime = goodsSeckill.getStartTime();
- LocalDateTime endTime = goodsSeckill.getEndTime();
- LocalDateTime checkTime = LocalDateTime.now().plusHours(1);
- //秒杀在一小时内开始
- if (checkTime.isAfter(startTime)) {
- Long id = goodsSeckill.getId();
- LocalDateTime now = LocalDateTime.now();
- String seckillStartTaskKey = DelayTaskEnum.SECKILL_START_TASK.getCode() + "-" + id;
- //秒杀已经开始
- if (now.isAfter(startTime)) {
- //查询延时任务
- DelayTask startDelayTask = sysUserClient.getDelayTask(
- seckillStartTaskKey).getData();
- if (StringUtils.isNull(startDelayTask)) {
- redisService.setCacheObject(
- seckillStartTaskKey,
- startTime, 3L, TimeUnit.SECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(LocalDateTime.now());
- startDelayTask.setEndTime(LocalDateTime.now().plusSeconds(3));
- startDelayTask.setRedisKey(
- seckillStartTaskKey);
- sysUserClient.addDelayTask(startDelayTask);
- } else {
- if (!startDelayTask.getEndTime().isEqual(startTime)) {
- sysUserClient.deleteDelayTask(
- seckillStartTaskKey);
- redisService.deleteObject(
- seckillStartTaskKey);
- redisService.setCacheObject(
- seckillStartTaskKey,
- startTime, 3L, TimeUnit.SECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(LocalDateTime.now());
- startDelayTask.setEndTime(LocalDateTime.now().plusSeconds(3));
- startDelayTask.setRedisKey(
- seckillStartTaskKey);
- sysUserClient.addDelayTask(startDelayTask);
- }
- }
- } else {
- DelayTask startDelayTask = sysUserClient.getDelayTask(
- seckillStartTaskKey).getData();
- Duration duration = Duration.between(LocalDateTime.now(), startTime);
-
- if (StringUtils.isNull(startDelayTask)) {
- redisService.setCacheObject(
- seckillStartTaskKey,
- startTime, duration.toMillis(), TimeUnit.MILLISECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(LocalDateTime.now());
- startDelayTask.setEndTime(startTime);
- startDelayTask.setRedisKey(
- seckillStartTaskKey);
- sysUserClient.addDelayTask(startDelayTask);
- } else {
- if (!startDelayTask.getEndTime().isEqual(startTime)) {
- sysUserClient.deleteDelayTask(
- seckillStartTaskKey);
- redisService.deleteObject(
- seckillStartTaskKey);
- redisService.setCacheObject(
- seckillStartTaskKey,
- startTime, duration.toMillis(), TimeUnit.MILLISECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(LocalDateTime.now());
- startDelayTask.setEndTime(startTime);
- startDelayTask.setRedisKey(
- seckillStartTaskKey);
- sysUserClient.addDelayTask(startDelayTask);
- }
- }
- }
- String seckillEndTaskKey = DelayTaskEnum.SECKILL_END_TASK.getCode() + "-" + id;
- DelayTask endDelayTask = sysUserClient.getDelayTask(
- seckillEndTaskKey).getData();
- // 如果延时任务为空，创建延时任务控制活动定时开始和结束
- if (StringUtils.isNull(endDelayTask)) {
- Duration duration = Duration.between(LocalDateTime.now(), endTime);
- redisService.setCacheObject(
- seckillEndTaskKey,
- endTime, duration.toMillis(), TimeUnit.MILLISECONDS);
- endDelayTask = new DelayTask();
- endDelayTask.setDelFlag(0);
- endDelayTask.setCreateTime(LocalDateTime.now());
- endDelayTask.setEndTime(endTime);
- endDelayTask.setRedisKey(seckillEndTaskKey);
- sysUserClient.addDelayTask(endDelayTask);
- } else {
- Duration duration = Duration.between(LocalDateTime.now(), endTime);
- if (!endDelayTask.getEndTime().isEqual(endTime)) {
- sysUserClient.deleteDelayTask(seckillEndTaskKey);
- redisService.deleteObject(seckillEndTaskKey);
- redisService.setCacheObject(
- seckillEndTaskKey,
- endTime, duration.toMillis(), TimeUnit.MILLISECONDS);
- endDelayTask = new DelayTask();
- endDelayTask.setDelFlag(0);
- endDelayTask.setCreateTime(LocalDateTime.now());
- endDelayTask.setEndTime(endTime);
- endDelayTask.setRedisKey(seckillEndTaskKey);
- sysUserClient.addDelayTask(endDelayTask);
- }
- }
+ GoodsSku goodsSku = goodsSkuService.getById(goodsSeckill.getGoodsSkuId());
+ if (StringUtils.isNull(goodsSku)) {
+ throw new ServiceException("商品不存在");
}
+ Integer seckillStock = goodsSeckill.getSeckillStock();
+ goodsSkuService.lambdaUpdate()
+ .set(GoodsSku::getStock, goodsSku.getStock() - seckillStock)
+ .ge(GoodsSku::getStock, seckillStock)
+ .eq(GoodsSku::getId, goodsSku.getId());
+ asyncMethodService.seckillScheduleTask(goodsSeckill);
}
}
+
/**
* 获取秒杀商品列表的分页数据
@@ -198,6 +96,7 @@
* @param upd 商品秒杀数据传输对象
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void updGoodsSeckill(GoodsSeckillUpd upd) {
//查询秒杀商品
GoodsSeckill goodsSeckill = this.getById(upd.getId());
@@ -206,6 +105,7 @@
}
GoodsSeckill goodsSeckillUpd = BeanUtils.copyBean(upd, GoodsSeckill.class);
this.updateById(goodsSeckillUpd);
+ asyncMethodService.seckillScheduleTask(goodsSeckill);
}
/**
@@ -261,7 +161,8 @@
CacheConstants.SECKILL_GOODS + goodsSeckill.getId(),
goodsSeckill.getSeckillStock());
}
- //TODO websocket 推送秒杀开始消息
+ //推送秒杀开始消息
+ WebSocketUsers.sendMessageToUsersByText("秒杀活动已开始");
}
/**
@@ -282,5 +183,6 @@
redisService.deleteObject(CacheConstants.SECKILL_GOODS + goodsSeckill.getId());
}
//TODO websocket 推送秒杀结束消息
+ WebSocketUsers.sendMessageToUsersByText("秒杀活动已结束");
}
}
--
Gitblit v1.7.1