From ab2bb11eeed2ef4585b0a030c88f23b521b22dd0 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 31 Mar 2023 16:48:43 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0mac=20m=E8=8A=AF?= =?UTF-8?q?=E7=89=87=E5=90=AF=E5=8A=A8=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/framework/pom.xml b/framework/pom.xml index 8e631d655..bfcd88a3f 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -460,6 +460,14 @@ system ${project.basedir}/src/main/resources/maven-repository/SF-CSIM-EXPRESS-SDK-V2.1.7.jar + + + io.netty + netty-resolver-dns-native-macos + 4.1.90.Final + runtime + osx-aarch_64 + From b07fc790e5f32a577320daef1c2876b9393727a0 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 31 Mar 2023 16:49:42 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96es=E5=95=86?= =?UTF-8?q?=E5=93=81=E6=90=9C=E7=B4=A2=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E3=80=82=E5=87=8F=E5=B0=91=E9=87=8D=E5=A4=8D=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/GoodsBuyerController.java | 8 +++---- .../search/service/EsGoodsSearchService.java | 10 +++++++++ .../serviceimpl/EsGoodsSearchServiceImpl.java | 21 +++++++++++++++---- 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index fc5a5f0d1..19caa3e01 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -18,14 +18,13 @@ import cn.lili.modules.search.service.HotWordsService; import cn.lili.modules.statistics.aop.PageViewPoint; import cn.lili.modules.statistics.aop.enums.PageViewEnum; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.elasticsearch.core.SearchPage; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; @@ -104,10 +103,9 @@ public class GoodsBuyerController { @ApiOperation(value = "从ES中获取商品信息") @GetMapping("/es") - public ResultMessage> getGoodsByPageFromEs(EsGoodsSearchDTO goodsSearchParams, PageVO pageVO) { + public ResultMessage> getGoodsByPageFromEs(EsGoodsSearchDTO goodsSearchParams, PageVO pageVO) { pageVO.setNotConvert(true); - SearchPage esGoodsIndices = goodsSearchService.searchGoods(goodsSearchParams, pageVO); - return ResultUtil.data(esGoodsIndices); + return ResultUtil.data(goodsSearchService.searchGoodsByPage(goodsSearchParams, pageVO)); } @ApiOperation(value = "从ES中获取相关商品品牌名称，分类名称及属性") diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java index 22b46a27a..61930be05 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java @@ -4,6 +4,7 @@ import cn.lili.common.vo.PageVO; import cn.lili.modules.search.entity.dos.EsGoodsIndex; import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo; import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springframework.data.elasticsearch.core.SearchPage; import java.util.List; @@ -25,6 +26,15 @@ public interface EsGoodsSearchService { */ SearchPage searchGoods(EsGoodsSearchDTO searchDTO, PageVO pageVo); + /** + * 商品搜索 + * + * @param searchDTO 搜索参数 + * @param pageVo 分页参数 + * @return 搜索结果 + */ + Page searchGoodsByPage(EsGoodsSearchDTO searchDTO, PageVO pageVo); + /** * 获取筛选器 * 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 669e6241c..114109f82 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 @@ -17,6 +17,7 @@ import cn.lili.modules.search.entity.dto.SelectorOptions; import cn.lili.modules.search.service.EsGoodsSearchService; import cn.lili.modules.search.utils.SqlFilter; import com.alibaba.druid.util.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.apache.lucene.search.join.ScoreMode; import org.elasticsearch.common.lucene.search.function.FieldValueFactorFunction; @@ -37,15 +38,13 @@ import org.elasticsearch.search.sort.SortOrder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; -import org.springframework.data.elasticsearch.core.ElasticsearchOperations; -import org.springframework.data.elasticsearch.core.SearchHitSupport; -import org.springframework.data.elasticsearch.core.SearchHits; -import org.springframework.data.elasticsearch.core.SearchPage; +import org.springframework.data.elasticsearch.core.*; import org.springframework.data.elasticsearch.core.query.NativeSearchQuery; import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder; import org.springframework.stereotype.Service; import java.util.*; +import java.util.stream.Collectors; /** * ES商品搜索业务层实现 @@ -95,6 +94,20 @@ public class EsGoodsSearchServiceImpl implements EsGoodsSearchService { return SearchHitSupport.searchPageFor(search, searchQuery.getPageable()); } + @Override + public Page searchGoodsByPage(EsGoodsSearchDTO searchDTO, PageVO pageVo) { + SearchPage esGoodsIndices = this.searchGoods(searchDTO, pageVo); + Page resultPage = new Page<>(); + if (esGoodsIndices != null && !esGoodsIndices.getContent().isEmpty()) { + List collect = esGoodsIndices.getSearchHits().getSearchHits().stream().map(SearchHit::getContent).collect(Collectors.toList()); + resultPage.setRecords(collect); + resultPage.setPages(esGoodsIndices.getTotalPages()); + resultPage.setCurrent(esGoodsIndices.getNumber() + 1L); + resultPage.setSize(esGoodsIndices.getSize()); + resultPage.setTotal(esGoodsIndices.getTotalElements()); + } + return resultPage; + } @Override public EsGoodsRelatedInfo getSelector(EsGoodsSearchDTO goodsSearch, PageVO pageVo) { From 9f01078fe0a093fd9c0b1382fb0750435b34f223 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 31 Mar 2023 16:50:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?feat:=20=E5=8D=87=E7=BA=A7druid=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=EF=BC=8C=E8=A7=A3=E5=86=B3mysql=E4=B8=80=E7=9B=B4?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97=E9=97=AE=E9=A2=98?= 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 29fcaf500..84a36127f 100644 --- a/pom.xml +++ b/pom.xml @@ -41,7 +41,7 @@ 2.2.2 0.11.2 4.0.0 - 1.2.8 + 1.2.16 1.0.3 4.7.2 4.7.2 From 4ebe0d4f43f9c3903eb74ad2f4510ebf00ffcedc Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 31 Mar 2023 16:58:34 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90?= =?UTF-8?q?es=E7=B4=A2=E5=BC=95=EF=BC=8C=E5=8F=AA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=A7=E4=BA=8E0=E7=9A=84=E5=95=86?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/listener/GoodsMessageListener.java | 1 + .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java index 692e3ade8..e89499151 100644 --- a/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java +++ b/consumer/src/main/java/cn/lili/listener/GoodsMessageListener.java @@ -343,6 +343,7 @@ public class GoodsMessageListener implements RocketMQListener { searchParams.setGoodsId(goods.getId()); searchParams.setPageNumber(i); searchParams.setPageSize(BATCH_SIZE); + searchParams.setGeQuantity(0); IPage goodsSkuByPage = this.goodsSkuService.getGoodsSkuByPage(searchParams); if (goodsSkuByPage == null || goodsSkuByPage.getRecords().isEmpty()) { break; 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 3c12ceefe..d54b3150a 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 @@ -167,6 +167,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements skuQueryWrapper.eq("gs.auth_flag", GoodsAuthEnum.PASS.name()); skuQueryWrapper.eq("gs.market_enable", GoodsStatusEnum.UPPER.name()); skuQueryWrapper.eq("gs.delete_flag", false); + skuQueryWrapper.ge("gs.quantity", 0); Map resultMap = (Map) cache.get(CachePrefix.INIT_INDEX_PROCESS.getPrefix()); @@ -176,6 +177,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements skuCountQueryWrapper.eq("auth_flag", GoodsAuthEnum.PASS.name()); skuCountQueryWrapper.eq("market_enable", GoodsStatusEnum.UPPER.name()); skuCountQueryWrapper.eq("delete_flag", false); + skuCountQueryWrapper.ge("gs.quantity", 0); resultMap = new HashMap<>(); resultMap.put(KEY_SUCCESS, 0L); resultMap.put(KEY_FAIL, 0L); From bc670d263d53d63076f03a84a7d32017014dc231 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Fri, 31 Mar 2023 18:23:30 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=94=9F=E6=88=90?= =?UTF-8?q?es=E7=B4=A2=E5=BC=95=EF=BC=8C=E5=8F=AA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=A4=A7=E4=BA=8E0=E7=9A=84=E5=95=86?= =?UTF-8?q?=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d54b3150a..eec23bbce 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 @@ -167,7 +167,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements skuQueryWrapper.eq("gs.auth_flag", GoodsAuthEnum.PASS.name()); skuQueryWrapper.eq("gs.market_enable", GoodsStatusEnum.UPPER.name()); skuQueryWrapper.eq("gs.delete_flag", false); - skuQueryWrapper.ge("gs.quantity", 0); + skuQueryWrapper.gt("gs.quantity", 0); Map resultMap = (Map) cache.get(CachePrefix.INIT_INDEX_PROCESS.getPrefix()); From 81f47a7fb6ca54dc469e9a755ed57961ba75c612 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Tue, 4 Apr 2023 17:55:47 +0800 Subject: [PATCH 6/9] =?UTF-8?q?fix:=20=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/promotion/entity/dto/search/CouponSearchParams.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java index eddecde61..80227ee11 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/search/CouponSearchParams.java @@ -103,7 +103,7 @@ public class CouponSearchParams extends BasePromotionsSearchParams implements Se } if (this.getStartTime() != null) { - queryWrapper.ge("start_time", new Date(this.getEndTime())); + queryWrapper.ge("start_time", new Date(this.getStartTime())); } if (this.getEndTime() != null) { queryWrapper.le("end_time", new Date(this.getEndTime())); From 864701adfbd6fb21c4d87124e076a97fc90f408f Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Wed, 5 Apr 2023 10:28:19 +0800 Subject: [PATCH 7/9] =?UTF-8?q?wrapper=20=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eec23bbce..b886af484 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 @@ -177,7 +177,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements skuCountQueryWrapper.eq("auth_flag", GoodsAuthEnum.PASS.name()); skuCountQueryWrapper.eq("market_enable", GoodsStatusEnum.UPPER.name()); skuCountQueryWrapper.eq("delete_flag", false); - skuCountQueryWrapper.ge("gs.quantity", 0); + skuCountQueryWrapper.ge("quantity", 0); resultMap = new HashMap<>(); resultMap.put(KEY_SUCCESS, 0L); resultMap.put(KEY_FAIL, 0L); From 9294f77163b6c04804f2a00fa750ac94fa9b6b4d Mon Sep 17 00:00:00 2001 From: "pikachu1995@126.com" Date: Thu, 6 Apr 2023 08:16:23 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E7=99=BB=E5=BD=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/connect/serviceimpl/ConnectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 46c0c5b31..bd8d6c0e1 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -187,8 +187,8 @@ public class ConnectServiceImpl extends ServiceImpl impl connectAuthUser.setAvatar(params.getImage()); connectAuthUser.setUsername("m" + phone); connectAuthUser.setPhone(phone); - connectAuthUser.setSource(ConnectEnum.WECHAT.name()); - connectAuthUser.setType(ClientTypeEnum.WECHAT_MP.name()); + connectAuthUser.setSource(ClientTypeEnum.WECHAT_MP.name()); + connectAuthUser.setType(ConnectEnum.WECHAT.name()); AuthToken authToken = new AuthToken(); authToken.setUnionId(unionId); From 675830045db669be0550fb3a4e83604d51505377 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 6 Apr 2023 10:28:54 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9B=B4=E6=96=B0?= =?UTF-8?q?es=E5=95=86=E5=93=81=E7=B4=A2=E5=BC=95=E4=BF=83=E9=94=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E6=89=B9=E9=87=8F=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=88=86=E9=A1=B5=E8=B5=B7=E5=A7=8B=E9=A1=B5=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 eec23bbce..972d0ebc2 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 @@ -608,7 +608,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements } private void executeUpdateEsGoodsIndexAll(BasePromotions promotion, String key) { - for (int i = 1; ; i++) { + for (int i = 0; ; i++) { List skuIds; //如果storeId不为空，则表示是店铺活动 if (promotion.getStoreId() != null && !promotion.getStoreId().equals(PromotionTools.PLATFORM_ID)) {