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

framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java

@@ -184,6 +184,7 @@ public class SeckillApplyServiceImpl extends ServiceImpl<SeckillApplyMapper, Sec
         //保存促销活动商品信息
         if (!promotionGoodsList.isEmpty()) {
             PromotionGoodsSearchParams searchParams = new PromotionGoodsSearchParams();
+            searchParams.setPromotionId(seckillId);
             searchParams.setStoreId(storeId);
             searchParams.setPromotionType(PromotionTypeEnum.SECKILL.name());
             searchParams.setSkuIds(promotionGoodsList.stream().map(PromotionGoods::getSkuId).collect(Collectors.toList()));

framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java

@@ -562,7 +562,8 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
      */
     private List<FunctionScoreQueryBuilder.FilterFunctionBuilder> buildKeywordSearch(String keyword) {
         List<FunctionScoreQueryBuilder.FilterFunctionBuilder> filterFunctionBuilders = new ArrayList<>();
-        MatchQueryBuilder goodsNameQuery = QueryBuilders.matchQuery("goodsName", keyword).operator(Operator.AND);
+        // operator 为 AND 时 需全部分词匹配。为 OR 时 需配置 minimumShouldMatch（最小分词匹配数）不设置默认为1
+        MatchQueryBuilder goodsNameQuery = QueryBuilders.matchQuery("goodsName", keyword).operator(Operator.OR).minimumShouldMatch("2");
         //分词匹配
         filterFunctionBuilders.add(new FunctionScoreQueryBuilder.FilterFunctionBuilder(goodsNameQuery,
                 ScoreFunctionBuilders.weightFactorFunction(10)));

framework/src/main/java/cn/lili/modules/system/service/RegionService.java

@@ -36,6 +36,14 @@ public interface RegionService extends IService<Region> {
     @Cacheable(key = "#id")
     List<Region> getItem(String id);
 
+    /**
+     * 根据最后一级名称获取改所有上级地区id
+     *
+     * @param lastName 最后一级名称
+     * @return 全部地区id
+     */
+    String getItemByLastName(String lastName);
+
     /**
      * 获取地址
      *

framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java

@@ -61,6 +61,25 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         }
     }
 
+    /**
+     * 根据最后一级名称获取改所有上级地区id
+     *
+     * @param lastName 最后一级名称
+     * @return 全部地区id
+     */
+    @Override
+    public String getItemByLastName(String lastName) {
+        StringBuilder sql = new StringBuilder();
+        LambdaQueryWrapper<Region> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(Region::getName, lastName);
+        Region region = this.getOne(lambdaQueryWrapper, false);
+        if (region != null) {
+            sql.append(region.getPath()).append(",").append(region.getId());
+            return sql.toString().replace(",0,","");
+        }
+        return null;
+    }
+
     @Override
     public List<Region> getItem(String id) {
         LambdaQueryWrapper<Region> lambdaQueryWrapper = new LambdaQueryWrapper<>();

framework/src/main/java/cn/lili/modules/wechat/serviceimpl/WechatMessageServiceImpl.java

@@ -87,14 +87,14 @@ public class WechatMessageServiceImpl extends ServiceImpl<WechatMessageMapper, W
                     oldList.add(JSONUtil.parseObj(item).getStr("template_id"));
                 });
             }
-            if (oldList.size() != 0) {
+/*            if (oldList.size() != 0) {
                 oldList.forEach(templateId -> {
                     Map<String, Object> params = new HashMap<>(1);
                     params.put("template_id", templateId);
                     String message = WechatMessageUtil.wechatHandler(HttpUtils.doPostWithJson(delMsgTpl + accessToken, params));
                     log.info("删除模版请求:{},删除模版响应：{}", params, message);
                 });
-            }
+            }*/
 
             //加入数据
             List<WechatMessageData> tmpList = initData();