From b2fb415ab5b7e17d89bab18cf47d88ae7608ad51 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Wed, 12 Apr 2023 16:12:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=B6=B3=E8=BF=B9?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/FootprintServiceImpl.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index f0c92f6c7..b97f97f43 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -1,13 +1,13 @@ package cn.lili.modules.member.serviceimpl; import cn.lili.common.security.context.UserContext; -import cn.lili.common.vo.PageVO; +import cn.lili.modules.goods.entity.dos.GoodsSku; +import cn.lili.modules.goods.service.GoodsSkuService; import cn.lili.modules.member.entity.dos.FootPrint; import cn.lili.modules.member.entity.dto.FootPrintQueryParams; import cn.lili.modules.member.mapper.FootprintMapper; import cn.lili.modules.member.service.FootprintService; import cn.lili.modules.search.entity.dos.EsGoodsIndex; -import cn.lili.modules.search.service.EsGoodsSearchService; import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; /** @@ -34,7 +32,7 @@ public class FootprintServiceImpl extends ServiceImpl footPrintPage(FootPrintQueryParams params) { - IPage footPrintPages = this.page(PageUtil.initPage(params), params.queryWrapper()); + params.setSort("createTime"); + Page footPrintPages = this.page(PageUtil.initPage(params), params.queryWrapper()); //定义结果 - IPage esGoodsIndexIPage = new Page<>(); - - if (footPrintPages.getRecords() == null || footPrintPages.getRecords().isEmpty()) { - return esGoodsIndexIPage; - } else { - List list = esGoodsSearchService.getEsGoodsBySkuIds( - footPrintPages.getRecords().stream().map(FootPrint::getSkuId).collect(Collectors.toList()), params); + Page esGoodsIndexIPage = new Page<>(); + if (footPrintPages.getRecords() != null && !footPrintPages.getRecords().isEmpty()) { + List skuIds = footPrintPages.getRecords().stream().map(FootPrint::getSkuId).collect(Collectors.toList()); + List goodsSkuByIdFromCache = goodsSkuService.getGoodsSkuByIdFromCache(skuIds); esGoodsIndexIPage.setPages(footPrintPages.getPages()); - esGoodsIndexIPage.setRecords(list); + esGoodsIndexIPage.setRecords(goodsSkuByIdFromCache.stream().map(i -> { + Optional first = footPrintPages.getRecords().stream().filter(j -> j.getSkuId().equals(i.getId())).findFirst(); + return first.map(footPrint -> new EsGoodsIndex(i, footPrint.getCreateTime())).orElseGet(() -> new EsGoodsIndex(i)); + }).sorted(Comparator.comparingLong(EsGoodsIndex::getReleaseTime).reversed()).collect(Collectors.toList())); esGoodsIndexIPage.setTotal(footPrintPages.getTotal()); esGoodsIndexIPage.setSize(footPrintPages.getSize()); esGoodsIndexIPage.setCurrent(footPrintPages.getCurrent()); return esGoodsIndexIPage; } + return esGoodsIndexIPage; } @Override From 38ad5bb394d3a578eca4c8e632d03b21fce24dc2 Mon Sep 17 00:00:00 2001 From: misworga831 Date: Wed, 12 Apr 2023 16:13:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E4=BF=83=E9=94=80=E7=8A=B6=E6=80=81=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=83=E9=94=80=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java | 3 +++ .../promotion/serviceimpl/AbstractPromotionsServiceImpl.java | 1 + .../java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java index 1cef92e11..938c9fb3c 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java @@ -102,6 +102,9 @@ public class CartSkuVO extends CartBase implements Serializable { */ public CartSkuVO(GoodsSku goodsSku) { this.goodsSku = goodsSku; + if (goodsSku.getUpdateTime() == null) { + this.goodsSku.setUpdateTime(goodsSku.getCreateTime()); + } this.checked = true; this.invalid = false; //默认时间为0，让系统为此商品更新缓存 diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java index 8d13a2e2f..3a16eb861 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/AbstractPromotionsServiceImpl.java @@ -112,6 +112,7 @@ public abstract class AbstractPromotionsServiceImpl, T e List promotionsList = this.list(new QueryWrapper().in("id", ids)); for (T t : promotionsList) { if (startTime != null && endTime != null) { + this.checkPromotions(t); t.setStartTime(new Date(startTime)); t.setEndTime(new Date(endTime)); } else { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java index 743b5dd5b..493f594c3 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java @@ -350,6 +350,11 @@ public class EsGoodsIndex implements Serializable { } } + public EsGoodsIndex(GoodsSku sku, Date createDate) { + this(sku); + this.releaseTime = createDate.getTime(); + } + public void setGoodsSku(GoodsSku sku) { if (sku != null) { this.id = sku.getId(); From 7cc0a90acf997b0ef4728260725570861939b56e Mon Sep 17 00:00:00 2001 From: misworga831 Date: Thu, 13 Apr 2023 15:44:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E5=AE=9A=E9=94=99=E8=AF=AF=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/member/serviceimpl/MemberSignServiceImpl.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java index 2134109cf..19a684abb 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java @@ -1,6 +1,5 @@ package cn.lili.modules.member.serviceimpl; -import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.properties.RocketmqCustomProperties; @@ -8,7 +7,6 @@ import cn.lili.common.security.AuthUser; import cn.lili.common.security.context.UserContext; import cn.lili.common.utils.CurrencyUtil; import cn.lili.common.utils.DateUtil; -import cn.lili.modules.goods.entity.dos.Specification; import cn.lili.modules.member.entity.dos.MemberSign; import cn.lili.modules.member.entity.enums.PointTypeEnum; import cn.lili.modules.member.mapper.MemberSignMapper; @@ -21,10 +19,7 @@ import cn.lili.modules.system.entity.enums.SettingEnum; import cn.lili.modules.system.service.SettingService; import cn.lili.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.rocketmq.tags.MemberTagsEnum; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.gson.Gson; import org.apache.rocketmq.spring.core.RocketMQTemplate; @@ -73,7 +68,7 @@ public class MemberSignServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(MemberSign::getMemberId, authUser.getId()); List signSize = this.baseMapper.getTodayMemberSign(queryWrapper); - if (signSize.isEmpty()) { + if (!signSize.isEmpty()) { throw new ServiceException(ResultCode.MEMBER_SIGN_REPEAT); } //当前签到天数的前一天日期