Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop

framework/src/main/java/cn/lili/modules/member/service/MemberService.java

@@ -239,8 +239,8 @@ public interface MemberService extends IService<Member> {
 
     /**
      * 获取用户VO
-     * @param id
-     * @return
+     * @param id 会员id
+     * @return 用户VO
      */
     MemberVO getMember(String id);
 }

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();
                 });
             }