caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chopper 2021-11-18 17:23:52 +08:00
commit 3cabf0a32c
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java
View File

@ -1,6 +1,5 @@
package cn.lili.timetask.handler.impl.coupon; 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.dos.MemberCoupon;
import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum; import cn.lili.modules.promotion.entity.enums.MemberCouponStatusEnum;
import cn.lili.modules.promotion.service.MemberCouponService; import cn.lili.modules.promotion.service.MemberCouponService;
@ -43,7 +42,7 @@ public class CouponExecute implements EveryDayExecute {
this.memberCouponService.update(updateWrapper); this.memberCouponService.update(updateWrapper);
Calendar calendar = Calendar.getInstance(); 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(); Date removeTime = calendar.getTime();
//删除过期/已使用的优惠券 //删除过期/已使用的优惠券
LambdaUpdateWrapper<MemberCoupon> deleteWrapper = new LambdaUpdateWrapper<MemberCoupon>() LambdaUpdateWrapper<MemberCoupon> deleteWrapper = new LambdaUpdateWrapper<MemberCoupon>()

2
framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java
View File

@ -160,7 +160,7 @@ public class OrderSearchParams extends PageVO {
wrapper.like(CharSequenceUtil.isNotEmpty(clientType), "o.client_type", clientType); 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)) { if (CharSequenceUtil.isNotEmpty(tag)) {

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

@ -364,7 +364,17 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService {
//关键字检索 //关键字检索
if (CharSequenceUtil.isEmpty(searchDTO.getKeyword())) { if (CharSequenceUtil.isEmpty(searchDTO.getKeyword())) {
nativeSearchQueryBuilder.withQuery(QueryBuilders.matchAllQuery()); List<FunctionScoreQueryBuilder.FilterFunctionBuilder> 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 { } else {
this.keywordSearch(filterBuilder, searchDTO.getKeyword()); this.keywordSearch(filterBuilder, searchDTO.getKeyword());
} }

2
pom.xml
View File

@ -18,7 +18,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<revision>4.2.2</revision> <revision>4.2.3</revision>
<docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry> <docker-registry>registry.cn-beijing.aliyuncs.com/lili-images</docker-registry>
<images-version>1</images-version> <images-version>1</images-version>
<alipay-sdk-version>4.13.40.ALL</alipay-sdk-version> <alipay-sdk-version>4.13.40.ALL</alipay-sdk-version>