From 7c9dda6138ceea88a312583a3fcc9b2bb356fbc4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期六, 05 八月 2023 09:37:54 +0800
Subject: [PATCH] bug和二维码
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/activity/ActivityServiceImpl.java | 285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 273 insertions(+), 12 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 ac9260d..63415ad 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,15 +1,15 @@
package com.ruoyi.goods.service.impl.activity;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.ruoyi.goods.domain.dto.MgtActivityEditDto;
-import com.ruoyi.goods.domain.dto.MgtActivityGoodsEditDto;
-import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
-import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
+import com.ruoyi.common.redis.service.RedisService;
+import com.ruoyi.goods.domain.dto.*;
import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.ruoyi.goods.domain.pojo.activity.ActivityTotal;
import com.ruoyi.goods.domain.vo.*;
@@ -19,17 +19,22 @@
import com.ruoyi.goods.service.activity.ActivityService;
import com.ruoyi.goods.service.activity.ActivityTotalService;
import com.ruoyi.system.api.constant.AppErrorConstant;
-import com.ruoyi.system.api.domain.dto.ActivityGoodsGetDto;
-import com.ruoyi.system.api.domain.dto.MerPageDto;
-import com.ruoyi.system.api.domain.dto.MgtBaseBathDto;
-import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
+import com.ruoyi.system.api.constant.DelayTaskEnum;
+import com.ruoyi.system.api.constant.SecurityConstant;
+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.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.RemoteFileService;
import com.ruoyi.system.api.service.RemoteMemberService;
import com.ruoyi.system.api.service.RemoteShopService;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -38,6 +43,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -69,6 +75,19 @@
@Resource
private RemoteMemberService remoteMemberService;
+
+ @Resource
+ private RemoteConfigService remoteConfigService;
+
+ @Resource
+ private RedisService redisService;
+
+
+ @Autowired
+ private RedissonClient redissonClient;
+
+ @Resource
+ private RemoteFileService remoteFileService;
/**
* @param mgtActivityEditDto
@@ -108,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?activityId="+activityId;
+ codeGetDto.setUrl(url);
+ codeGetDto.setFileName("activity-"+activityId);
+ String codeUrl = remoteFileService.getAppOrderTotal(codeGetDto).getData();
+ activity.setActivityCode(codeUrl);
}
// 获取活动开始时间和结束时间
Date activityStartTime = mgtActivityEditDto.getActivityStartTime();
@@ -115,13 +140,12 @@
// 根据当前时间和活动时间判断活动状态
if (nowTime.compareTo(activityStartTime) < 0) {
activity.setActivityStatus(0);
- } else if (nowTime.compareTo(activityStartTime) >= 0 && nowTime.compareTo(activityEndTime) <= 0) {
- activity.setActivityStatus(1);
- } else if (nowTime.compareTo(activityEndTime) > 0) {
- activity.setActivityStatus(2);
+ } else {
+ throw new ServiceException(AppErrorConstant.ACTIVITY_TIME_ERROR);
}
// 设置活动信息
activity.setActivityName(mgtActivityEditDto.getActivityName());
+ activity.setActivityIntroduce(mgtActivityEditDto.getActivityIntroduce());
activity.setActivityStartTime(activityStartTime);
activity.setActivityEndTime(activityEndTime);
activity.setGroupBuyNumber(mgtActivityEditDto.getGroupBuyNumber());
@@ -149,6 +173,7 @@
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());
@@ -158,6 +183,62 @@
).collect(Collectors.toList());
if (!activityGoodsList.isEmpty()) {
activityGoodsService.saveBatch(activityGoodsList);
+ }
+ }
+ //如果活动在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;
+ 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);
+ }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();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (endDelayTask == null) {
+ 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);
+ }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, startTimeDifference, TimeUnit.MILLISECONDS);
+ endDelayTask = new DelayTask();
+ endDelayTask.setDelFlag(0);
+ endDelayTask.setCreateTime(new Date());
+ endDelayTask.setEndTime(activityStartTime);
+ endDelayTask.setRedisKey(DelayTaskEnum.ACTIVITY_END_TASK.getCode() + "-" + activityId);
+ remoteConfigService.addDelayTask(endDelayTask);
+ }
}
}
}
@@ -338,6 +419,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());
@@ -354,4 +436,183 @@
activityGoodsGetVo.setAvailableBuyNum(availableBuyNum);
return activityGoodsGetVo;
}
+
+ /**
+ * @description 活动定时开始
+ * @author jqs
+ * @date 2023/7/12 19:44
+ * @param
+ * @return void
+ */
+ @Override
+ public void timingStartActivity(){
+ // 创建LambdaQueryWrapper对象
+ LambdaQueryWrapper<Activity> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(Activity::getDelFlag, 0);
+ queryWrapper.eq(Activity::getActivityStatus, 0);
+ // 计算时间差
+ Date checkTime = DateUtils.addMinutes(new Date(), 61);
+ queryWrapper.lt(Activity::getActivityStartTime, checkTime);
+ // 查询符合条件的活动列表
+ List<Activity> activityList = activityMapper.selectList(queryWrapper);
+ // 如果活动列表不为空
+ if (activityList != null && !activityList.isEmpty()) {
+ // 遍历活动列表
+ for (Activity activity : activityList) {
+ String activityId = activity.getActivityId();
+ Date activityStartTime = activity.getActivityStartTime();
+ Date activityEndTime = activity.getActivityEndTime();
+ 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);
+ }
+ // 查询延时任务
+ DelayTask endDelayTask = remoteConfigService.getDelayTask(DelayTaskEnum.ACTIVITY_START_TASK.getCode() + "-" + activityId).getData();
+ // 如果延时任务为空，创建延时任务控制活动定时开始和结束
+ if (endDelayTask == null) {
+ 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);
+ }
+ }
+ }
+ }
+
+ /**
+ * @description 开始活动
+ * @author jqs
+ * @date 2023/7/12 20:31
+ * @param activityId
+ * @return void
+ */
+ @Override
+ public void startActivity(String activityId){
+ log.debug(activityId+"活动开始");
+ Activity activity = this.getById(activityId);
+ 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());
+ }
+ }
+ this.saveOrUpdate(activity);
+ }
+ }
+
+ /**
+ * @description 结束活动
+ * @author jqs
+ * @date 2023/7/12 20:31
+ * @param activityId
+ * @return void
+ */
+ @Override
+ public void endActivity(String activityId){
+ Activity activity = this.getById(activityId);
+ if(activity!=null&&activity.getActivityStatus()==1){
+ activity.setActivityStatus(2);
+ List<ActivityGoods> activityGoodsList = activityGoodsService.listByActivityId(activityId);
+ if(activityGoodsList!=null&&!activityGoodsList.isEmpty()){
+ for(ActivityGoods activityGoods : activityGoodsList){
+ redisService.deleteObject(SecurityConstant.ACTIVITY_GOODS+"-"+activityId+"-"+activityGoods.getGoodsId());
+ }
+ }
+ this.saveOrUpdate(activity);
+ }
+ }
+
+ /**
+ * @description 活动商品库存变化
+ * @author jqs
+ * @date 2023/7/13 13:53
+ * @param
+ * @return void
+ */
+ @Override
+ public void changeActivityTotal(ActivityTotalChangeDto activityTotalChangeDto){
+
+ RLock lock = redissonClient.getLock("activity_clock_"+activityTotalChangeDto.getActivityId());
+ try {
+ lock.lock(30, TimeUnit.SECONDS);
+ //判断活动商品是否售罄，是则停止活动
+ /*Integer noSellOut = activityMapper.checkSellOut(activityTotalChangeDto.getActivityId());
+ if(noSellOut==0){
+ endActivity(activityTotalChangeDto.getActivityId());
+ }*/
+ //更新活动统计
+ ActivityTotal activityTotal = activityTotalService.getById(activityTotalChangeDto.getActivityId());
+ if(activityTotalChangeDto.getChangeType()==1){
+ activityTotal.setOrderTotal(activityTotal.getOrderTotal()+activityTotalChangeDto.getChangeNum());
+ activityTotal.setPersonTotal(activityTotal.getPersonTotal()+activityTotalChangeDto.getPersonNum());
+ activityTotal.setOrderMoneyTotal(activityTotal.getOrderMoneyTotal().add(activityTotalChangeDto.getMoney()));
+ }else{
+ activityTotal.setOrderTotal(activityTotal.getOrderTotal()-activityTotalChangeDto.getChangeNum());
+ activityTotal.setPersonTotal(activityTotal.getPersonTotal()-activityTotalChangeDto.getPersonNum());
+ activityTotal.setRefundTotal(activityTotal.getRefundTotal()+activityTotalChangeDto.getRefundNum());
+ activityTotal.setOrderMoneyTotal(activityTotal.getOrderMoneyTotal().subtract(activityTotalChangeDto.getMoney()));
+ }
+ activityTotalService.saveOrUpdate(activityTotal);
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ /**
+ * @description 活动商品库存变化
+ * @author jqs
+ * @date 2023/7/13 13:53
+ * @param
+ * @return void
+ */
+ @Override
+ 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 {
+ lock.unlock();
+ }
+ }
+
+ /**
+ * @description 获取活动列表
+ * @author jqs
+ * @date 2023/7/17 14:46
+ * @param staffActivityListDto
+ * @return List<MgtActivityListVo>
+ */
+ @Override
+ public List<MgtActivityListVo> listStaffActivity(StaffActivityListDto staffActivityListDto){
+ return activityMapper.listStaffActivity(staffActivityListDto);
+ }
+
+ private void createActivityCode(String activityId){
+
+
+
+
+ }
}
--
Gitblit v1.7.1