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

合并master业务代码

Browse Source
This commit is contained in:
Chopper 2021-06-15 16:21:03 +08:00
parent a97b698d8e
commit 5f403ec675
12 changed files with 41 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
consumer/src/main/java/cn/lili/trigger/listen/PromotionDelayQueueListen.java
View File

@ -29,6 +29,6 @@ public class PromotionDelayQueueListen extends AbstractDelayQueueListen {
@Override @Override
public String setDelayQueueName() { public String setDelayQueueName() {
return DelayQueueEnums.PROMOTION_QUEUE.name(); return DelayQueueEnums.PROMOTION.name();
} }
} }

6
framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java
View File

@ -2,8 +2,6 @@ package cn.lili.common.trigger.delay.queue;
import cn.lili.common.trigger.delay.AbstractDelayQueueMachineFactory; import cn.lili.common.trigger.delay.AbstractDelayQueueMachineFactory;
import cn.lili.common.trigger.enums.DelayQueueEnums; import cn.lili.common.trigger.enums.DelayQueueEnums;
import cn.lili.common.trigger.interfaces.TimeTrigger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
@ -18,11 +16,9 @@ import org.springframework.stereotype.Component;
@Component @Component
public class PromotionDelayQueue extends AbstractDelayQueueMachineFactory { public class PromotionDelayQueue extends AbstractDelayQueueMachineFactory {
@Autowired
private TimeTrigger timeTrigger;
@Override @Override
public String setDelayQueueName() { public String setDelayQueueName() {
return DelayQueueEnums.PROMOTION_QUEUE.name(); return DelayQueueEnums.PROMOTION.name();
} }
} }

4
framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java
View File

@ -7,9 +7,9 @@ public enum DelayQueueEnums {
/** /**
* 促销任务队列 * 促销活动
*/ */
PROMOTION_QUEUE("促销任务队列"); PROMOTION("促销活动");
private String description; private String description;

4
framework/src/main/java/cn/lili/common/trigger/enums/PromotionDelayTypeEnums.java → framework/src/main/java/cn/lili/common/trigger/enums/DelayTypeEnums.java
View File

@ -6,7 +6,7 @@ package cn.lili.common.trigger.enums;
* @author paulG * @author paulG
* @since 2021/5/7 * @since 2021/5/7
*/ */
public enum PromotionDelayTypeEnums { public enum DelayTypeEnums {
/** /**
* 促销活动 * 促销活动
@ -24,7 +24,7 @@ public enum PromotionDelayTypeEnums {
private String description; private String description;
PromotionDelayTypeEnums(String description) { DelayTypeEnums(String description) {
this.description = description; this.description = description;
} }

4
framework/src/main/java/cn/lili/common/trigger/util/DelayQueueTools.java
View File

@ -1,6 +1,6 @@
package cn.lili.common.trigger.util; package cn.lili.common.trigger.util;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
/** /**
* 延时任务工具类 * 延时任务工具类
@ -22,7 +22,7 @@ public class DelayQueueTools {
* @param id id * @param id id
* @return 唯一键 * @return 唯一键
*/ */
public static String wrapperUniqueKey(PromotionDelayTypeEnums type, String id) { public static String wrapperUniqueKey(DelayTypeEnums type, String id) {
return "{TIME_TRIGGER_" + type.name() + "}_" + id; return "{TIME_TRIGGER_" + type.name() + "}_" + id;
} }

15
framework/src/main/java/cn/lili/modules/broadcast/serviceimpl/StudioServiceImpl.java
View File

@ -5,7 +5,7 @@ import cn.lili.common.delayqueue.BroadcastMessage;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.security.context.UserContext; import cn.lili.common.security.context.UserContext;
import cn.lili.common.trigger.enums.DelayQueueType; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
import cn.lili.common.trigger.model.TimeExecuteConstant; import cn.lili.common.trigger.model.TimeExecuteConstant;
import cn.lili.common.trigger.model.TimeTriggerMsg; import cn.lili.common.trigger.model.TimeTriggerMsg;
@ -72,19 +72,20 @@ public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> impleme
BroadcastMessage broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.START.name()); BroadcastMessage broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.START.name());
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR,
Long.parseLong(studio.getStartTime()) * 1000L, broadcastMessage, Long.parseLong(studio.getStartTime()) * 1000L, broadcastMessage,
DelayQueueTools.wrapperUniqueKey(DelayQueueType.BROADCAST, studio.getId()), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg, DateUtil.getDelayTime(Long.parseLong(studio.getStartTime()) * 1000L)); this.timeTrigger.addDelay(timeTriggerMsg);
//直播结束延时任务 //直播结束延时任务
broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.END.name()); broadcastMessage = new BroadcastMessage(studio.getId(), StudioStatusEnum.END.name());
timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR, timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.BROADCAST_EXECUTOR,
Long.parseLong(studio.getEndTime()) * 1000L, broadcastMessage, Long.parseLong(studio.getEndTime()) * 1000L, broadcastMessage,
DelayQueueTools.wrapperUniqueKey(DelayQueueType.BROADCAST, studio.getId()), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg, DateUtil.getDelayTime(Long.parseLong(studio.getEndTime()) * 1000L)); this.timeTrigger.addDelay(timeTriggerMsg);
} }
return true; return true;
@ -107,7 +108,7 @@ public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> impleme
broadcastMessage, broadcastMessage,
Long.parseLong(oldStudio.getStartTime()), Long.parseLong(oldStudio.getStartTime()),
Long.parseLong(studio.getStartTime()), Long.parseLong(studio.getStartTime()),
DelayQueueTools.wrapperUniqueKey(DelayQueueType.BROADCAST, studio.getId()), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
DateUtil.getDelayTime(Long.parseLong(studio.getStartTime())), DateUtil.getDelayTime(Long.parseLong(studio.getStartTime())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
@ -118,7 +119,7 @@ public class StudioServiceImpl extends ServiceImpl<StudioMapper, Studio> impleme
broadcastMessage, broadcastMessage,
Long.parseLong(oldStudio.getEndTime()), Long.parseLong(oldStudio.getEndTime()),
Long.parseLong(studio.getEndTime()), Long.parseLong(studio.getEndTime()),
DelayQueueTools.wrapperUniqueKey(DelayQueueType.BROADCAST, studio.getId()), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.BROADCAST, studio.getId()),
DateUtil.getDelayTime(Long.parseLong(studio.getEndTime())), DateUtil.getDelayTime(Long.parseLong(studio.getEndTime())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }

7
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
View File

@ -1,7 +1,6 @@
package cn.lili.modules.order.order.serviceimpl; package cn.lili.modules.order.order.serviceimpl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil; import cn.hutool.core.io.IoUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
@ -11,7 +10,7 @@ import cn.hutool.poi.excel.ExcelUtil;
import cn.hutool.poi.excel.ExcelWriter; import cn.hutool.poi.excel.ExcelWriter;
import cn.lili.common.aop.syslog.annotation.SystemLogPoint; import cn.lili.common.aop.syslog.annotation.SystemLogPoint;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PintuanOrderMessage; import cn.lili.common.trigger.message.PintuanOrderMessage;
import cn.lili.common.enums.ResultCode; import cn.lili.common.enums.ResultCode;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
@ -76,9 +75,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.ServletOutputStream; import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.*;
@ -642,7 +639,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
startTime, startTime,
pintuanOrderMessage, pintuanOrderMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PINTUAN_ORDER, (pintuanId + parentOrderSn)), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PINTUAN_ORDER, (pintuanId + parentOrderSn)),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);

10
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
View File

@ -2,7 +2,7 @@ package cn.lili.modules.promotion.serviceimpl;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
@ -93,7 +93,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
coupon.getStartTime().getTime(), coupon.getStartTime().getTime(),
promotionMessage, promotionMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);
@ -116,7 +116,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR,
promotionMessage, promotionMessage,
coupon.getStartTime().getTime(), couponVO.getStartTime().getTime(), coupon.getStartTime().getTime(), couponVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(couponVO.getStartTime().getTime()), DateUtil.getDelayTime(couponVO.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
return couponVO; return couponVO;
@ -144,7 +144,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR,
promotionMessage, promotionMessage,
couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(couponVO.getStartTime().getTime()), DateUtil.getDelayTime(couponVO.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
@ -166,7 +166,7 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
this.mongoTemplate.remove(new Query().addCriteria(Criteria.where("id").is(id)), CouponVO.class); this.mongoTemplate.remove(new Query().addCriteria(Criteria.where("id").is(id)), CouponVO.class);
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
couponVO.getStartTime().getTime(), couponVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.COUPON.name() + couponVO.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.COUPON.name() + couponVO.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
return result; return result;
} }

8
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
View File

@ -1,7 +1,7 @@
package cn.lili.modules.promotion.serviceimpl; package cn.lili.modules.promotion.serviceimpl;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
@ -103,7 +103,7 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
fullDiscountVO.getStartTime().getTime(), promotionMessage, fullDiscountVO.getStartTime().getTime(), promotionMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);
@ -159,7 +159,7 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
// 发送更新延时任务 // 发送更新延时任务
this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR, promotionMessage, this.timeTrigger.edit(TimeExecuteConstant.PROMOTION_EXECUTOR, promotionMessage,
fullDiscount.getStartTime().getTime(), fullDiscountVO.getStartTime().getTime(), fullDiscount.getStartTime().getTime(), fullDiscountVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(fullDiscountVO.getStartTime().getTime()), DateUtil.getDelayTime(fullDiscountVO.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
return fullDiscountVO; return fullDiscountVO;
@ -186,7 +186,7 @@ public class FullDiscountServiceImpl extends ServiceImpl<FullDiscountMapper, Ful
this.promotionGoodsService.removePromotionGoods(fullDiscount.getPromotionGoodsList(), PromotionTypeEnum.FULL_DISCOUNT); this.promotionGoodsService.removePromotionGoods(fullDiscount.getPromotionGoodsList(), PromotionTypeEnum.FULL_DISCOUNT);
} }
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, fullDiscount.getStartTime().getTime(), this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, fullDiscount.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.FULL_DISCOUNT.name() + fullDiscount.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.FULL_DISCOUNT.name() + fullDiscount.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
return result; return result;
} }

8
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java
View File

@ -2,7 +2,7 @@ package cn.lili.modules.promotion.serviceimpl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
@ -223,7 +223,7 @@ public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> impl
promotionMessage, promotionMessage,
pintuanVO.getStartTime().getTime(), pintuanVO.getStartTime().getTime(),
pintuan.getStartTime().getTime(), pintuan.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(pintuanVO.getStartTime().getTime()), DateUtil.getDelayTime(pintuanVO.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
@ -390,7 +390,7 @@ public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> impl
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
pintuan.getStartTime().getTime(), pintuan.getStartTime().getTime(),
promotionMessage, promotionMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);
@ -405,7 +405,7 @@ public class PintuanServiceImpl extends ServiceImpl<PintuanMapper, Pintuan> impl
private void removePintuanGoodsFromEs(String id, Long originStartTime) { private void removePintuanGoodsFromEs(String id, Long originStartTime) {
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
originStartTime, originStartTime,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.PINTUAN.name() + id)), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.PINTUAN.name() + id)),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }

10
framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java
View File

@ -2,7 +2,7 @@ package cn.lili.modules.promotion.serviceimpl;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
@ -120,7 +120,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, Point
promotionMessage, promotionMessage,
pointsGoodsVO.getStartTime().getTime(), pointsGoodsVO.getStartTime().getTime(),
pointsGoods.getStartTime().getTime(), pointsGoods.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(pointsGoods.getStartTime().getTime()), DateUtil.getDelayTime(pointsGoods.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
@ -149,7 +149,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, Point
this.goodsIndexService.deleteEsGoodsPromotionIndexByList(Collections.singletonList(pointsGoodsVO.getSkuId()), PromotionTypeEnum.POINTS_GOODS); this.goodsIndexService.deleteEsGoodsPromotionIndexByList(Collections.singletonList(pointsGoodsVO.getSkuId()), PromotionTypeEnum.POINTS_GOODS);
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
pointsGoodsVO.getStartTime().getTime(), pointsGoodsVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.POINTS_GOODS.name() + pointsGoodsVO.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.POINTS_GOODS.name() + pointsGoodsVO.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
} }
@ -169,7 +169,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, Point
PointsGoodsVO pointsGoodsVO = this.checkExist(id); PointsGoodsVO pointsGoodsVO = this.checkExist(id);
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
pointsGoodsVO.getStartTime().getTime(), pointsGoodsVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.POINTS_GOODS.name() + pointsGoodsVO.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.POINTS_GOODS.name() + pointsGoodsVO.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
skuIds.add(pointsGoodsVO.getSkuId()); skuIds.add(pointsGoodsVO.getSkuId());
} }
@ -243,7 +243,7 @@ public class PointsGoodsServiceImpl extends ServiceImpl<PointsGoodsMapper, Point
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
promotionMessage.getStartTime().getTime(), promotionMessage.getStartTime().getTime(),
promotionMessage, promotionMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);

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

@ -1,7 +1,7 @@
package cn.lili.modules.promotion.serviceimpl; package cn.lili.modules.promotion.serviceimpl;
import cn.lili.common.trigger.util.DelayQueueTools; import cn.lili.common.trigger.util.DelayQueueTools;
import cn.lili.common.trigger.enums.PromotionDelayTypeEnums; import cn.lili.common.trigger.enums.DelayTypeEnums;
import cn.lili.common.trigger.message.PromotionMessage; import cn.lili.common.trigger.message.PromotionMessage;
import cn.lili.common.exception.ServiceException; import cn.lili.common.exception.ServiceException;
import cn.lili.common.trigger.interfaces.TimeTrigger; import cn.lili.common.trigger.interfaces.TimeTrigger;
@ -169,7 +169,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
promotionMessage, promotionMessage,
seckill.getStartTime().getTime(), seckill.getStartTime().getTime(),
seckillVO.getStartTime().getTime(), seckillVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
DateUtil.getDelayTime(seckillVO.getStartTime().getTime()), DateUtil.getDelayTime(seckillVO.getStartTime().getTime()),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
@ -190,7 +190,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
this.promotionGoodsService.update(promotionGoodsQueryWrapper); this.promotionGoodsService.update(promotionGoodsQueryWrapper);
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
seckill.getStartTime().getTime(), seckill.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.SECKILL.name() + seckill.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.SECKILL.name() + seckill.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} else { } else {
throw new ServiceException("该秒杀活动活动的状态不能删除"); throw new ServiceException("该秒杀活动活动的状态不能删除");
@ -233,7 +233,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
} }
this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR, this.timeTrigger.delete(TimeExecuteConstant.PROMOTION_EXECUTOR,
seckillVO.getStartTime().getTime(), seckillVO.getStartTime().getTime(),
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (PromotionTypeEnum.SECKILL.name() + seckillVO.getId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (PromotionTypeEnum.SECKILL.name() + seckillVO.getId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
} }
} else { } else {
@ -264,7 +264,7 @@ public class SeckillServiceImpl extends ServiceImpl<SeckillMapper, Seckill> impl
TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR, TimeTriggerMsg timeTriggerMsg = new TimeTriggerMsg(TimeExecuteConstant.PROMOTION_EXECUTOR,
seckill.getStartTime().getTime(), seckill.getStartTime().getTime(),
promotionMessage, promotionMessage,
DelayQueueTools.wrapperUniqueKey(PromotionDelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())), DelayQueueTools.wrapperUniqueKey(DelayTypeEnums.PROMOTION, (promotionMessage.getPromotionType() + promotionMessage.getPromotionId())),
rocketmqCustomProperties.getPromotionTopic()); rocketmqCustomProperties.getPromotionTopic());
// 发送促销活动开始的延时任务 // 发送促销活动开始的延时任务
this.timeTrigger.addDelay(timeTriggerMsg); this.timeTrigger.addDelay(timeTriggerMsg);