From 6bcf6da16565fc95f9dba61f2c23d4d71eededb0 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 16 Feb 2022 17:48:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=92=E6=9D=80=E6=AF=8F?= =?UTF-8?q?=E6=97=A5=E6=B8=85=E9=99=A4=E6=97=A0=E6=95=88=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/member/service/MemberService.java | 4 ++-- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index f79a123f..d7115916 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -239,8 +239,8 @@ public interface MemberService extends IService { /** * 获取用户VO - * @param id - * @return + * @param id 会员id + * @return 用户VO */ MemberVO getMember(String id); } \ No newline at end of file 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 70f497f8..bc502171 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,8 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements if (promotionMap != null && !promotionMap.isEmpty()) { //促销不为空则进行清洗 promotionMap.entrySet().removeIf(i -> { - BasePromotions promotion = (BasePromotions) i.getValue(); + JSONObject promotionJson = (JSONObject) i.getValue(); + BasePromotions promotion = promotionJson.toBean(BasePromotions.class); return promotion.getEndTime() != null && promotion.getEndTime().getTime() < DateUtil.date().getTime(); }); }