From 805197c1271735126ce1e8b7e8b01261ed00b76b Mon Sep 17 00:00:00 2001 From: paulGao Date: Tue, 16 Nov 2021 18:27:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8F=82=E6=95=B0=EF=BC=88=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E8=AF=84=E8=AE=BA=E7=8A=B6=E6=80=81=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/order/order/entity/dto/OrderSearchParams.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java index 23a96389..864a152e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java @@ -160,7 +160,7 @@ public class OrderSearchParams extends PageVO { wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType); //按评价状态 - wrapper.like(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus); + wrapper.eq(CharSequenceUtil.isNotEmpty(commentStatus), "oi.comment_status", commentStatus); //按标签查询 if (CharSequenceUtil.isNotEmpty(tag)) { From f1c0207a3d7b885e9d42f29b90058f2f3744275a Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 17 Nov 2021 17:06:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96es=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/serviceimpl/EsGoodsSearchServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java index 3891e4fb..6dedfa97 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java @@ -364,7 +364,17 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { //关键字检索 if (CharSequenceUtil.isEmpty(searchDTO.getKeyword())) { - nativeSearchQueryBuilder.withQuery(QueryBuilders.matchAllQuery()); + List filterFunctionBuilders = new ArrayList<>(); + GaussDecayFunctionBuilder skuNoScore = ScoreFunctionBuilders.gaussDecayFunction("skuSource", 100, 10).setWeight(10); + FunctionScoreQueryBuilder.FilterFunctionBuilder skuNoBuilder = new FunctionScoreQueryBuilder.FilterFunctionBuilder(QueryBuilders.matchAllQuery(), skuNoScore); + filterFunctionBuilders.add(skuNoBuilder); + FunctionScoreQueryBuilder.FilterFunctionBuilder[] builders = new FunctionScoreQueryBuilder.FilterFunctionBuilder[filterFunctionBuilders.size()]; + filterFunctionBuilders.toArray(builders); + FunctionScoreQueryBuilder functionScoreQueryBuilder = QueryBuilders.functionScoreQuery(builders) + .scoreMode(FunctionScoreQuery.ScoreMode.SUM) + .setMinScore(2); + //聚合搜索则将结果放入过滤条件 + filterBuilder.must(functionScoreQueryBuilder); } else { this.keywordSearch(filterBuilder, searchDTO.getKeyword()); } From d43b679f8d7df36a6bf5c513fb826741cf2d531d Mon Sep 17 00:00:00 2001 From: hhf <614792109@qq.com> Date: Wed, 17 Nov 2021 17:48:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E8=BF=87?= =?UTF-8?q?=E6=9C=9F=E5=88=A0=E9=99=A4bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/timetask/handler/impl/coupon/CouponExecute.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java index 4894a994..613380d6 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java @@ -1,6 +1,5 @@ package cn.lili.timetask.handler.impl.coupon; -import cn.lili.common.utils.DateUtil; import cn.lili.modules.promotion.entity.dos.MemberCoupon; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import cn.lili.modules.promotion.service.MemberCouponService; @@ -43,7 +42,7 @@ public class CouponExecute implements EveryDayExecute { this.memberCouponService.update(updateWrapper); Calendar calendar = Calendar.getInstance(); - calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) + EXPIRATION_DAY); + calendar.set(Calendar.DAY_OF_MONTH, calendar.get(Calendar.DAY_OF_MONTH) - EXPIRATION_DAY); Date removeTime = calendar.getTime(); //删除过期/已使用的优惠券 LambdaUpdateWrapper deleteWrapper = new LambdaUpdateWrapper() From 8a29ce048dd8403f1b894de0d3e2712bc42afd06 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 17 Nov 2021 18:30:08 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 94157681..a81e6fcd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 - 4.2.2 + 4.2.3 registry.cn-beijing.aliyuncs.com/lili-images 1 4.13.40.ALL