From c793c47d45e9843e0c2d66b30c62e58d1886e983 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Tue, 14 Mar 2023 19:37:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=85=B3=E9=97=AD=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/serviceimpl/GoodsServiceImpl.java | 2 +- .../serviceimpl/SystemLogServiceImpl.java | 20 +++++++++---------- .../store/serviceimpl/StoreServiceImpl.java | 11 +++++++--- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index e56898cb4..c1ae964b3 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -133,7 +133,7 @@ public class GoodsServiceImpl extends ServiceImpl implements //获取商品ID列表 List list = this.baseMapper.getGoodsIdByStoreId(storeId); //下架店铺下的商品 - updateGoodsMarketAble(list, GoodsStatusEnum.DOWN, "店铺关闭"); + this.updateGoodsMarketAbleByStoreId(storeId, GoodsStatusEnum.DOWN, "店铺关闭"); applicationEventPublisher.publishEvent(new TransactionCommitSendMQEvent("下架商品", rocketmqCustomProperties.getGoodsTopic(), GoodsTagsEnum.DOWN.name(), JSONUtil.toJsonStr(list))); diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index 693794c04..bd8f63869 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -1,6 +1,5 @@ package cn.lili.modules.permission.serviceimpl; -import cn.hutool.core.date.DateUtil; import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.vo.PageVO; import cn.lili.common.vo.SearchVO; @@ -9,7 +8,9 @@ import cn.lili.modules.permission.repository.SystemLogRepository; import cn.lili.modules.permission.service.SystemLogService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import org.elasticsearch.common.unit.Fuzziness; import org.elasticsearch.index.query.BoolQueryBuilder; +import org.elasticsearch.index.query.MultiMatchQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; @@ -82,25 +83,22 @@ public class SystemLogServiceImpl implements SystemLogService { } if (CharSequenceUtil.isNotEmpty(operatorName)) { - nativeSearchQueryBuilder.withFilter(QueryBuilders.wildcardQuery("username", "*" + operatorName + "*")); + nativeSearchQueryBuilder.withQuery(QueryBuilders.matchQuery("username", operatorName)); } if (CharSequenceUtil.isNotEmpty(key)) { - BoolQueryBuilder filterBuilder = new BoolQueryBuilder(); - filterBuilder.should(QueryBuilders.wildcardQuery("requestUrl", "*" + key + "*")) - .should(QueryBuilders.wildcardQuery("requestParam", "*" + key + "*")) - .should(QueryBuilders.wildcardQuery("responseBody", "*" + key + "*")) - .should(QueryBuilders.wildcardQuery("name", "*" + key + "*")); - nativeSearchQueryBuilder.withFilter(filterBuilder); + MultiMatchQueryBuilder multiMatchQueryBuilder = QueryBuilders.multiMatchQuery(key, "requestUrl", "requestParam", "responseBody", "name"); + multiMatchQueryBuilder.fuzziness(Fuzziness.AUTO); + nativeSearchQueryBuilder.withFilter(multiMatchQueryBuilder); } //时间有效性判定 if (searchVo.getConvertStartDate() != null && searchVo.getConvertEndDate() != null) { BoolQueryBuilder filterBuilder = new BoolQueryBuilder(); //大于方法 - filterBuilder.must( + filterBuilder.filter( QueryBuilders.rangeQuery("createTime") - .gte(DateUtil.format(searchVo.getConvertStartDate(), "dd/MM/yyyy")) - .lte(DateUtil.format(searchVo.getConvertEndDate(), "dd/MM/yyyy")).format("dd/MM/yyyy||yyyy")); + .gte(searchVo.getConvertStartDate().getTime()) + .lte(searchVo.getConvertEndDate().getTime())); nativeSearchQueryBuilder.withFilter(filterBuilder); } diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 4c6931c99..e7928cf44 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -235,11 +235,16 @@ public class StoreServiceImpl extends ServiceImpl implements public boolean disable(String id) { Store store = this.getById(id); if (store != null) { - store.setStoreDisable(StoreStatusEnum.CLOSED.value()); + LambdaUpdateWrapper storeLambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + storeLambdaUpdateWrapper.eq(Store::getId, id); + storeLambdaUpdateWrapper.set(Store::getStoreDisable, StoreStatusEnum.CLOSED.value()); + boolean update = this.update(storeLambdaUpdateWrapper); //下架所有此店铺商品 - goodsService.underStoreGoods(id); - return this.updateById(store); + if (update) { + goodsService.underStoreGoods(id); + } + return update; } throw new ServiceException(ResultCode.STORE_NOT_EXIST); From 0c652eac6379cf686711974c6e7283fcd5787452 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Tue, 21 Mar 2023 14:39:53 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20hutool=20=E4=BE=9D=E8=B5=96=E6=9B=B4?= =?UTF-8?q?=E6=96=B0,=E4=BE=9D=E8=B5=96=E4=BC=98=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- framework/pom.xml | 4 ---- .../lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java | 5 ++--- im-api/pom.xml | 5 +++++ pom.xml | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/framework/pom.xml b/framework/pom.xml index 3003fb452..c14cf3710 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -51,10 +51,6 @@ - - org.springframework.boot - spring-boot-starter-websocket - org.springframework.boot spring-boot-starter-web diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 2cc364b10..c516b6c23 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -312,9 +312,8 @@ public class GoodsSkuServiceImpl extends ServiceImpl i map.put("data", goodsSkuDetail); //获取分类 - String[] split = goodsSkuDetail.getCategoryPath().split(","); - map.put("wholesaleList", wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId())); - map.put("categoryName", categoryService.getCategoryNameByIds(Arrays.asList(split))); + map.put("wholesaleList", GoodsSalesModeEnum.WHOLESALE.name().equals(goodsVO.getSalesModel()) ? wholesaleService.findByGoodsId(goodsSkuDetail.getGoodsId()) : Collections.emptyList()); + map.put("categoryName", CharSequenceUtil.isNotEmpty(goodsIndex.getCategoryNamePath()) ? goodsIndex.getCategoryNamePath().split(",") : null); //获取规格信息 map.put("specs", this.groupBySkuAndSpec(goodsVO.getSkuList())); diff --git a/im-api/pom.xml b/im-api/pom.xml index 7f823cf47..8f6efc474 100644 --- a/im-api/pom.xml +++ b/im-api/pom.xml @@ -19,6 +19,11 @@ framework ${revision} + + + org.springframework.boot + spring-boot-starter-websocket + diff --git a/pom.xml b/pom.xml index 1d30464c3..e47063660 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 1 4.22.32.ALL 3.5.1 - 5.8.0 + 5.8.14 2.0.3.RELEASE 3.0.4 2.9.10 From fae4dcaae26d818d223946567a5657f0202025ea Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 23 Mar 2023 09:59:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E9=80=80=E8=BF=98=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E6=97=A0=E6=B3=95=E5=86=8D=E6=AC=A1=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=82=E4=BC=98=E5=8C=96=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=95=86=E5=93=81=E7=B4=A2=E5=BC=95=EF=BC=8C=E5=8F=AF?= =?UTF-8?q?=E8=83=BD=E5=A4=B1=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/promotion/serviceimpl/MemberCouponServiceImpl.java | 1 + .../modules/search/serviceimpl/EsGoodsIndexServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 1e130dc2c..467d48622 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -293,6 +293,7 @@ public class MemberCouponServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.in(MemberCoupon::getId, memberCouponIds); updateWrapper.set(MemberCoupon::getMemberCouponStatus, MemberCouponStatusEnum.NEW.name()); + updateWrapper.set(MemberCoupon::getConsumptionTime, null); return this.update(updateWrapper); } 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 562116603..3c12ceefe 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 @@ -455,7 +455,7 @@ public class EsGoodsIndexServiceImpl extends BaseElasticsearchService implements public void deleteIndex(Map queryFields) { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); for (Map.Entry entry : queryFields.entrySet()) { - boolQueryBuilder.filter(QueryBuilders.termsQuery(entry.getKey(), entry.getValue())); + boolQueryBuilder.filter(QueryBuilders.termsQuery(entry.getKey(), entry.getValue().toString())); } DeleteByQueryRequest deleteByQueryRequest = new DeleteByQueryRequest();