From c93e76c57a98e35abbf62d2f514d9ba51efd3243 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期一, 21 八月 2023 19:03:55 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 105 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 83 insertions(+), 22 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
index d689e18..798f229 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java
@@ -29,6 +29,7 @@
import com.ruoyi.system.api.domain.vo.MgtSimpleShopVo;
import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
import com.ruoyi.system.api.service.RemoteConfigService;
+import com.ruoyi.system.api.service.RemoteFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
import org.redisson.api.RLock;
@@ -38,10 +39,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -81,8 +79,12 @@
@Resource
private RedisService redisService;
+
@Autowired
private RedissonClient redissonClient;
+
+ @Resource
+ private RemoteFileService remoteFileService;
/**
* @param mgtActivityEditDto
@@ -96,6 +98,9 @@
Activity activity;
// 获取当前时间
Date nowTime = new Date();
+ if(mgtActivityEditDto.getActivityStartTime().compareTo(mgtActivityEditDto.getActivityEndTime())>0){
+ throw new ServiceException(AppErrorConstant.ACTIVITY_SE_ERROR);
+ }
// 如果活动ID不为空，则表示修改活动信息
if (StringUtils.isNotBlank(mgtActivityEditDto.getActivityId())) {
// 获取活动信息
@@ -122,6 +127,12 @@
activityTotal.setRefundTotal(0);
activityTotal.setOrderMoneyTotal(BigDecimal.ZERO);
activityTotalService.save(activityTotal);
+ CodeGetDto codeGetDto = new CodeGetDto();
+ String url = "https://wxapp.hhhrt.cn/mini/activity?id="+activityId;
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("activity-"+activityId);
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ activity.setActivityCode(codeUrl);
}
// 获取活动开始时间和结束时间
Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
@@ -130,7 +141,8 @@
if (nowTime.compareTo(activityStartTime) < 0) {
activity.setActivityStatus(0);
} else {
- throw new ServiceException(AppErrorConstant.ACTIVITY_TIME_ERROR);
+ activity.setActivityStatus(1);
+
}
// 设置活动信息
activity.setActivityName(mgtActivityEditDto.getActivityName());
@@ -148,6 +160,18 @@
activity.setUpdateUserId(mgtActivityEditDto.getUserId());
activity.setUpdateTime(nowTime);
activity.setRecommendFlag(mgtActivityEditDto.getRecommendFlag());
+ if(activity.getAreaFlag()==2&&activity.getShopFlag()==1&&StringUtils.isNotBlank(activity.getDesignatedArea())){
+ activity.setApplicableShop("");
+ String designatedArea = activity.getDesignatedArea();
+ List<String> cityCodes = Arrays.asList(designatedArea.split(","));
+ List<Long> shopIdList = remoteShopService.listShopIdByCityCode(cityCodes).getData();
+ if(shopIdList!=null&&!shopIdList.isEmpty()){
+ String result = shopIdList.stream()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ activity.setApplicableShop(result);
+ }
+ }
this.saveOrUpdate(activity);
// 获取活动商品信息
List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
@@ -181,21 +205,37 @@
long currentTimeMillis = System.currentTimeMillis();
long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
long endTimeDifference = activityEndTime.getTime() - currentTimeMillis;
- // 查询延时任务
- DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
- // 如果延时任务为空，创建延时任务控制活动定时开始和结束
- if (startDelayTask == null) {
- redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
- startDelayTask = new DelayTask();
- startDelayTask.setDelFlag(0);
- startDelayTask.setCreateTime(new Date());
- startDelayTask.setEndTime(activityStartTime);
- startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
- remoteConfigService.addDelayTask(startDelayTask);
+ //判断任务是否已经开始,已经开始则3秒后立即开始
+ if(nowTime.compareTo(activityStartTime) > 0){
+ // 查询延时任务
+ DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (startDelayTask == null) {
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, 3L, TimeUnit.SECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }else{
+ if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, 3L, TimeUnit.SECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(DateUtils.addSeconds(new Date(),3));
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }
+ }
}else{
- if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
- remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
- redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ // 查询延时任务
+ DelayTask startDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (startDelayTask == null) {
redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
startDelayTask = new DelayTask();
startDelayTask.setDelFlag(0);
@@ -203,6 +243,18 @@
startDelayTask.setEndTime(activityStartTime);
startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
remoteConfigService.addDelayTask(startDelayTask);
+ }else{
+ if(startDelayTask.getEndTime().compareTo(activityStartTime)!=0){
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.deleteObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId, activityStartTime, startTimeDifference, TimeUnit.MILLISECONDS);
+ startDelayTask = new DelayTask();
+ startDelayTask.setDelFlag(0);
+ startDelayTask.setCreateTime(new Date());
+ startDelayTask.setEndTime(activityStartTime);
+ startDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(startDelayTask);
+ }
}
}
// 查询延时任务
@@ -408,6 +460,7 @@
String goodsId = activityGoodsGetDto.getGoodsId();
Activity activity = this.getById(activityId);
ActivityGoods activityGoods = activityGoodsService.getByGoodsId(activityId,goodsId);
+ activityGoodsGetVo.setActivityName(activity.getActivityName());
activityGoodsGetVo.setActivityPrice(activityGoods.getActivityPrice());
activityGoodsGetVo.setActivitySubscription(activityGoods.getActivitySubscription());
activityGoodsGetVo.setActivityStatus(activity.getActivityStatus());
@@ -466,7 +519,7 @@
remoteConfigService.addDelayTask(startDelayTask);
}
// 查询延时任务
- DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId).getData();
// 如果延时任务为空，创建延时任务控制活动定时开始和结束
if (endDelayTask == null) {
redisService.setCacheObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId, activityEndTime, endTimeDifference, TimeUnit.MILLISECONDS);
@@ -535,7 +588,7 @@
*/
@Override
public void changeActivityTotal(ActivityTotalChangeDto activityTotalChangeDto){
-
+ log.debug("活动统计变化---"+activityTotalChangeDto.toString());
RLock lock = redissonClient.getLock("activity_clock_"+activityTotalChangeDto.getActivityId());
try {
lock.lock(30, TimeUnit.SECONDS);
@@ -575,9 +628,10 @@
try {
lock.lock(30, TimeUnit.SECONDS);
if(agStockChangeDto.getChangeType()==1){
+ //减少销量增加库存
activityMapper.addActivityGoodsStock(agStockChangeDto);
}else{
- //更新库存
+ //增加销量减少库存
activityMapper.subActivityGoodsStock(agStockChangeDto);
}
} finally {
@@ -596,4 +650,11 @@
public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
return activityMapper.listStaffActivity(staffActivityListDto);
}
+
+ private void createActivityCode(String activityId){
+
+
+
+
+ }
}
--
Gitblit v1.7.1