From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 359 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 306 insertions(+), 53 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 eb3e653..4d6584b 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
@@ -1,8 +1,11 @@
package com.ruoyi.goods.service.impl.activity;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.constant.Constants;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
@@ -10,7 +13,7 @@
import com.ruoyi.common.core.utils.uuid.IdUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.goods.domain.dto.*;
-import com.ruoyi.goods.domain.pojo.activity.Activity;
+import com.ruoyi.system.api.domain.poji.activity.Activity;
import com.ruoyi.goods.domain.pojo.activity.ActivityTotal;
import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.goods.mapper.activity.ActivityMapper;
@@ -24,24 +27,22 @@
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.activity.ActivityGoods;
import com.ruoyi.system.api.domain.poji.config.DelayTask;
+import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.system.api.domain.vo.ActivityGoodsGetVo;
import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
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.RemoteMemberService;
-import com.ruoyi.system.api.service.RemoteShopService;
+import com.ruoyi.system.api.service.*;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
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 +82,17 @@
@Resource
private RedisService redisService;
+ @Resource
+ private RemoteOrderService remoteOrderService;
+
+ @Resource
+ private RemoteGoodsService remoteGoodsService;
+
@Autowired
private RedissonClient redissonClient;
+
+ @Resource
+ private RemoteFileService remoteFileService;
/**
* @param mgtActivityEditDto
@@ -96,16 +106,105 @@
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())) {
// 获取活动信息
activity = this.getById(mgtActivityEditDto.getActivityId());
- // 如果活动状态不为0，则表示活动正在进行中，不能修改
- if (activity.getActivityStatus() != 0) {
- throw new ServiceException(AppErrorConstant.ACTIVITY_ING_EDIT);
+ if(activity.getDelFlag() == 1){
+ throw new ServiceException(AppErrorConstant.ACTIVITY_DEL);
}
- // 删除活动商品信息
- activityGoodsService.deleteByActivityId(activity.getActivityId());
+ if(activity.getActivityStatus() == 2){
+ throw new ServiceException(AppErrorConstant.ACTIVITY_END);
+ }
+ //校验可以修改的项
+ if(activity.getActivityStatus() == 1){
+ /**
+ * 1、活动时间：已经开始活动开始时间不可修改，结束时间不能小于当前时间
+ * 2、是否限购
+ * - 不限购：无法修改。
+ * - 限购：只能增加
+ * 3、适用地区
+ * - 全部地区：无法修改。
+ * - 指定地区：只能新增
+ * 4、适用店铺
+ * - 全部店铺：无法修改
+ * - 指定店铺：只能新增
+ * 5、秒杀库存：只能增加
+ * 6、活动名称、宣传海报、是否推荐、活动简介：可直接修改
+ * 7、秒杀价和定金不能修改
+ */
+ if(activity.getActivityStartTime().getTime() != mgtActivityEditDto.getActivityStartTime().getTime()){
+ throw new ServiceException("活动开始后无法修改开始时间");
+ }
+ if(System.currentTimeMillis() >= mgtActivityEditDto.getActivityEndTime().getTime()){
+ throw new ServiceException("活动结束时间必须大于当前时间");
+ }
+ if(activity.getPurchaseLimitationFlag() == 0 && activity.getPurchaseLimitationFlag().compareTo(mgtActivityEditDto.getPurchaseLimitationFlag()) != 0){
+ throw new ServiceException("不能修改限购配置");
+ }
+ if(activity.getPurchaseLimitationFlag() == 1 && mgtActivityEditDto.getLimitNumber().compareTo(activity.getLimitNumber()) < 0){
+ throw new ServiceException("限购数量不能小于原始数量");
+ }
+ if(activity.getAreaFlag() == 1 && activity.getAreaFlag().compareTo(mgtActivityEditDto.getAreaFlag()) != 0){
+ throw new ServiceException("不能修改适用地区配置");
+ }
+ if(activity.getAreaFlag() == 2){
+ List<String> list = Arrays.asList(activity.getDesignatedArea().split(","));
+ List<String> list1 = Arrays.asList(mgtActivityEditDto.getDesignatedArea().split(","));
+ for (String s : list) {
+ if(!list1.contains(s)){
+ throw new ServiceException("适用地区只能增加");
+ }
+ }
+ }
+ if(activity.getShopFlag() == 1 && activity.getShopFlag().compareTo(mgtActivityEditDto.getShopFlag()) != 0){
+ throw new ServiceException("不能修改适用店铺配置");
+ }
+ if(activity.getShopFlag() == 2){
+ List<String> list = Arrays.asList(activity.getApplicableShop().split(","));
+ List<String> list1 = Arrays.asList(mgtActivityEditDto.getApplicableShop().split(","));
+ for (String s : list) {
+ if(!list1.contains(s)){
+ throw new ServiceException("适用店铺只能增加");
+ }
+ }
+ }
+
+ List<MgtActivityGoodsEditDto> mgtActivityGoodsEditDtoList = mgtActivityEditDto.getMgtActivityGoodsEditDtoList();
+ List<String> collect = mgtActivityGoodsEditDtoList.stream().map(MgtActivityGoodsEditDto::getGoodsId).collect(Collectors.toList());
+ List<ActivityGoods> list = activityGoodsService.list(new QueryWrapper<ActivityGoods>()
+ .eq("del_flag", 0)
+ .eq("activity_id", activity.getActivityId())
+ );
+ for (ActivityGoods activityGoods : list) {
+ String goodsId = activityGoods.getGoodsId();
+ BigDecimal activitySubscription1 = activityGoods.getActivitySubscription();
+ BigDecimal activityPrice1 = activityGoods.getActivityPrice();
+ Integer activityNumber1 = activityGoods.getActivityNumber();
+ if(!collect.contains(goodsId)){
+ throw new ServiceException("只能新增商品数据");
+ }
+ for (MgtActivityGoodsEditDto mgtActivityGoodsEditDto : mgtActivityGoodsEditDtoList) {
+ String goodsId1 = mgtActivityGoodsEditDto.getGoodsId();
+ BigDecimal activityPrice = mgtActivityGoodsEditDto.getActivityPrice();
+ BigDecimal activitySubscription = mgtActivityGoodsEditDto.getActivitySubscription();
+ Integer activityNumber = mgtActivityGoodsEditDto.getActivityNumber();
+ if(null != activitySubscription && null != activitySubscription1 &&
+ goodsId.equals(goodsId1) && activitySubscription1.compareTo(activitySubscription) != 0){
+ throw new ServiceException("不能修改定金");
+ }
+ if(goodsId.equals(goodsId1) && activityPrice1.compareTo(activityPrice) != 0){
+ throw new ServiceException("不能修改秒杀价");
+ }
+ if(goodsId.equals(goodsId1) && activityNumber1.compareTo(activityNumber) > 0){
+ throw new ServiceException("只能增加商品库存");
+ }
+ }
+ }
+ }
} else {
// 如果活动ID为空，则表示新增活动信息
activity = new Activity();
@@ -122,16 +221,24 @@
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);
+ activity.setActivityStatus(0);
}
// 获取活动开始时间和结束时间
Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
Date activityEndTime = mgtActivityEditDto.getActivityEndTime();
// 根据当前时间和活动时间判断活动状态
- if (nowTime.compareTo(activityStartTime) < 0) {
+ /*if (nowTime.compareTo(activityStartTime) < 0) {
activity.setActivityStatus(0);
} else {
- throw new ServiceException(AppErrorConstant.ACTIVITY_TIME_ERROR);
- }
+ activity.setActivityStatus(1);
+
+ }*/
// 设置活动信息
activity.setActivityName(mgtActivityEditDto.getActivityName());
activity.setActivityIntroduce(mgtActivityEditDto.getActivityIntroduce());
@@ -148,50 +255,143 @@
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();
+
+ //存储需要更新缓存的库存数量
+ List<Map<String, Object>> goods = new ArrayList<>();
// 如果活动商品信息不为空，则保存活动商品信息
if (!mgtActivityGoodsEditDtoList.isEmpty()) {
List<ActivityGoods> activityGoodsList = mgtActivityGoodsEditDtoList.stream().map(
dto -> {
- ActivityGoods activityGoods = new ActivityGoods();
- activityGoods.setDelFlag(0);
- activityGoods.setGoodsId(dto.getGoodsId());
- activityGoods.setActivityId(activity.getActivityId());
- activityGoods.setActivityPrice(dto.getActivityPrice());
- activityGoods.setActivitySubscription(dto.getActivitySubscription());
- activityGoods.setActivityNumber(dto.getActivityNumber());
- activityGoods.setSalesNumber(0);
- activityGoods.setActivityDeadline(activity.getActivityEndTime());
- activityGoods.setSellOutFlag(0);
- activityGoods.setPurchaseLimitationFlag(activity.getPurchaseLimitationFlag());
- activityGoods.setLimitNumber(activity.getLimitNumber());
+ ActivityGoods activityGoods = activityGoodsService.getOne(new LambdaQueryWrapper<ActivityGoods>()
+ .eq(ActivityGoods::getActivityId, activity.getActivityId())
+ .eq(ActivityGoods::getGoodsId, dto.getGoodsId())
+ .eq(ActivityGoods::getDelFlag, 0)
+ );
+ int number = 0;
+ if(null != activityGoods){
+ //剩余数量
+ Integer surpNum = redisService.getCacheObject(SecurityConstant.ACTIVITY_GOODS + "-" + activity.getActivityId() + "-" + dto.getGoodsId());
+ surpNum = null == surpNum ? 0 : surpNum;
+ number = surpNum + (dto.getActivityNumber() - activityGoods.getActivityNumber());
+ activityGoods.setActivityId(activity.getActivityId());
+ activityGoods.setActivityPrice(dto.getActivityPrice());
+ activityGoods.setActivitySubscription(dto.getActivitySubscription());
+ activityGoods.setActivityNumber(dto.getActivityNumber());
+ activityGoods.setActivityStock(dto.getActivityNumber());
+ activityGoods.setActivityDeadline(activity.getActivityEndTime());
+ activityGoods.setPurchaseLimitationFlag(activity.getPurchaseLimitationFlag());
+ activityGoods.setLimitNumber(activity.getLimitNumber());
+ }else{
+ number = dto.getActivityNumber();
+ activityGoods = new ActivityGoods();
+ activityGoods.setDelFlag(0);
+ activityGoods.setGoodsId(dto.getGoodsId());
+ activityGoods.setActivityId(activity.getActivityId());
+ activityGoods.setActivityPrice(dto.getActivityPrice());
+ activityGoods.setActivitySubscription(dto.getActivitySubscription());
+ activityGoods.setActivityNumber(dto.getActivityNumber());
+ activityGoods.setActivityStock(dto.getActivityNumber());
+ activityGoods.setSalesNumber(0);
+ activityGoods.setActivityDeadline(activity.getActivityEndTime());
+ activityGoods.setSellOutFlag(0);
+ activityGoods.setPurchaseLimitationFlag(activity.getPurchaseLimitationFlag());
+ activityGoods.setLimitNumber(activity.getLimitNumber());
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("goodsId", dto.getGoodsId());
+ map.put("number", number);
+ goods.add(map);
return activityGoods;
}
).collect(Collectors.toList());
if (!activityGoodsList.isEmpty()) {
- activityGoodsService.saveBatch(activityGoodsList);
+ activityGoodsService.saveOrUpdateBatch(activityGoodsList);
}
}
+
+ //进行中的活动更新缓存中库存数量
+ if(activity.getActivityStatus() == 1){
+ for (Map<String, Object> good : goods) {
+ String goodsId = good.get("goodsId").toString();
+ Integer number = Integer.valueOf(good.get("number").toString());
+ redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activity.getActivityId()+"-"+goodsId,number);
+ }
+ }
+
//如果活动在1小时内生成自动开始任务的延时任务
Date checkTime = DateUtils.addMinutes(new Date(),61);
if(checkTime.compareTo(activityStartTime)>0){
String activityId = activity.getActivityId();
long currentTimeMillis = System.currentTimeMillis();
long startTimeDifference = activityStartTime.getTime() - currentTimeMillis;
+ startTimeDifference = startTimeDifference < 0 ? 3L : startTimeDifference;
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{
+ // 查询延时任务
+ 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);
+ }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);
+ }
+ }
}
// 查询延时任务
DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId).getData();
@@ -204,6 +404,18 @@
endDelayTask.setEndTime(activityEndTime);
endDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
remoteConfigService.addDelayTask(endDelayTask);
+ }else{
+ if(endDelayTask.getEndTime().compareTo(activityEndTime)!=0){
+ remoteConfigService.deleteDelayTask(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+ redisService.deleteObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+ redisService.setCacheObject(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId, activityEndTime, endTimeDifference, TimeUnit.MILLISECONDS);
+ endDelayTask = new DelayTask();
+ endDelayTask.setDelFlag(0);
+ endDelayTask.setCreateTime(new Date());
+ endDelayTask.setEndTime(activityEndTime);
+ endDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(endDelayTask);
+ }
}
}
}
@@ -257,12 +469,14 @@
@Override
public void deleteMgtActivity(String activityId){
Activity activity = this.getById(activityId);
- if (activity.getActivityStatus() != 0) {
- throw new ServiceException(AppErrorConstant.ACTIVITY_ING_DELETE);
- }
+// if (activity.getActivityStatus() != 0) {
+// throw new ServiceException(AppErrorConstant.ACTIVITY_ING_DELETE);
+// }
activity.setDelFlag(1);
activity.setActivityStatus(-1);
this.saveOrUpdate(activity);
+ //活动结束
+ endActivity(activityId);
}
/**
@@ -296,7 +510,7 @@
MgtBaseBathDto mgtBaseBathDto = new MgtBaseBathDto();
mgtBaseBathDto = new MgtBaseBathDto();
mgtBaseBathDto.setIds(userJoinedString);
- List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(mgtBaseBathDto).getData();
+ List<MgtSimpleMemberVo> simpleMemberVoList = remoteMemberService.listSimpleVoByIds(userJoinedString).getData();
Map<Long, MgtSimpleMemberVo> userMap = simpleMemberVoList.stream()
.collect(Collectors.toMap(MgtSimpleMemberVo::getUserId, Function.identity()));
for (MgtActivityRecordPageVo mgtActivityRecordPageVo : activityRecordPageVoList) {
@@ -329,8 +543,12 @@
* @return List<MgtActivityListVo>
*/
@Override
- public List<MgtActivityListVo> listMgtActivity(){
- return activityMapper.listMgtActivity();
+ public List<MgtActivityListVo> listMgtActivity(MgtActivityListDto mgtActivityListDto){
+ List<MgtActivityListVo> activityListVoList = new ArrayList<>();
+ if(mgtActivityListDto.getActivityFrom()!=null&&mgtActivityListDto.getActivityFrom()!=2){
+ activityListVoList = activityMapper.listMgtActivity();
+ }
+ return activityListVoList;
}
/**
@@ -383,11 +601,14 @@
String activityId = activityGoodsGetDto.getActivityId();
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());
- Integer availableBuyNum = activityGoods.getActivityNumber() - activityGoods.getSalesNumber();
+ //剩余库存
+ Integer availableBuyNum = activityGoods.getActivityStock();
//限购判断
if(activityGoods.getPurchaseLimitationFlag()==1){
Integer buyNum = activityRecordService.getUserActivityGoodsNum(goodsId,activityId,activityGoodsGetDto.getUserId());
@@ -442,7 +663,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);
@@ -466,13 +687,14 @@
*/
@Override
public void startActivity(String activityId){
+ log.debug(activityId+"活动开始");
Activity activity = this.getById(activityId);
- if(activity!=null&&activity.getActivityStatus()==0){
+ if(activity!=null && activity.getActivityStatus() == 0){
activity.setActivityStatus(1);
List<ActivityGoods> activityGoodsList = activityGoodsService.listByActivityId(activityId);
if(activityGoodsList!=null&&!activityGoodsList.isEmpty()){
for(ActivityGoods activityGoods : activityGoodsList){
- redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityNumber());
+ redisService.setCacheObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId(),activityGoods.getActivityStock());
}
}
this.saveOrUpdate(activity);
@@ -510,7 +732,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);
@@ -545,14 +767,16 @@
* @return void
*/
@Override
+ @Transactional(propagation = Propagation.REQUIRES_NEW)
public void changeActivityStock(AGStockChangeDto agStockChangeDto){
RLock lock = redissonClient.getLock("stock_clock_"+agStockChangeDto.getActivityId()+"_"+agStockChangeDto.getGoodsId());
try {
lock.lock(30, TimeUnit.SECONDS);
if(agStockChangeDto.getChangeType()==1){
+ //减少销量增加库存
activityMapper.addActivityGoodsStock(agStockChangeDto);
}else{
- //更新库存
+ //增加销量减少库存
activityMapper.subActivityGoodsStock(agStockChangeDto);
}
} finally {
@@ -569,6 +793,35 @@
*/
@Override
public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
- return activityMapper.listStaffActivity(staffActivityListDto);
+ List<MgtActivityListVo> activityListVoList = new ArrayList<>();
+ if(staffActivityListDto.getActivityFrom()!=null&&staffActivityListDto.getActivityFrom()==1){
+ activityListVoList = activityMapper.listStaffActivity(staffActivityListDto);
+ }
+ return activityListVoList;
+ }
+
+
+ /**
+ * @description 判断商户是否在活动范围
+ * @author jqs
+ * @date 2023/9/7 14:13
+ * @param merActivityShopDto
+ * @return Boolean
+ */
+ @Override
+ public Boolean judgeActivityShop(MerActivityShopDto merActivityShopDto){
+ Boolean judge = false;
+ Long shopId = merActivityShopDto.getShopId();
+ Activity activity = this.getById(merActivityShopDto.getActivityId());
+ //判断是否全部商户
+ if(activity.getAreaFlag()==1&&activity.getShopFlag()==1){
+ judge = true;
+ }else{
+ //判断是否在商户范围内
+ String applicableShop = activity.getApplicableShop();
+ applicableShop = ","+applicableShop+",";
+ judge = applicableShop.contains(","+shopId.toString()+",");
+ }
+ return judge;
}
}
--
Gitblit v1.7.1