From 627a1d7d5ad2f351c93588875080b1cb5dd37412 Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 24 Feb 2022 09:33:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application.yml | 2 ++ .../handler/impl/promotion/PromotionEverydayExecute.java | 2 +- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/application.yml b/config/application.yml index c4bb5b36..327cf008 100644 --- a/config/application.yml +++ b/config/application.yml @@ -307,6 +307,8 @@ lili: notice-group: lili_notice_group notice-send-topic: lili_send_notice_topic notice-send-group: lili_send_notice_group + after-sale-topic: lili_after_sale_topic + after-sale-group: lili_after_sale_group rocketmq: name-server: 192.168.0.116:9876 isVIPChannel: false diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index c67ef4fe..98cdea1c 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -75,7 +75,7 @@ public class PromotionEverydayExecute implements EveryDayExecute { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(Seckill::getStartTime, seckill.getStartTime()); //如果已经存在促销，则不再次保存 - if (seckillService.list(lambdaQueryWrapper).size() == 0) { + if (seckillService.list(lambdaQueryWrapper).isEmpty()) { boolean result = seckillService.savePromotions(seckill); log.info("生成秒杀活动参数：{},结果：{}", seckill, result); } diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java index bc502171..9eacac60 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsIndexServiceImpl.java @@ -535,7 +535,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements if (promotionMap != null && !promotionMap.isEmpty()) { //促销不为空则进行清洗 promotionMap.entrySet().removeIf(i -> { - JSONObject promotionJson = (JSONObject) i.getValue(); + JSONObject promotionJson = JSONUtil.parseObj(i.getValue()); BasePromotions promotion = promotionJson.toBean(BasePromotions.class); return promotion.getEndTime() != null && promotion.getEndTime().getTime() < DateUtil.date().getTime(); });