From b83b070dc8cc823c877aa3a2ade134272ec0641a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期一, 07 七月 2025 17:02:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java | 25 +++++++------------------
1 files changed, 7 insertions(+), 18 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 714157a..595e162 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,5 +1,6 @@
package cn.lili.modules.member.serviceimpl;
+import cn.lili.base.Result;
import cn.lili.common.security.context.UserContext;
import cn.lili.modules.goods.entity.dos.GoodsSku;
import cn.lili.modules.goods.service.GoodsSkuService;
@@ -39,21 +40,7 @@
@Override
public FootPrint saveFootprint(FootPrint footPrint) {
- LambdaQueryWrapper<FootPrint> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.eq(FootPrint::getMemberId, footPrint.getMemberId());
- queryWrapper.eq(FootPrint::getGoodsId, footPrint.getGoodsId());
- //濡傛灉宸插瓨鍦ㄦ煇鍟嗗搧璁板綍锛屽垯鏇存柊鍏朵慨鏀规椂闂�
- //濡傛灉涓嶅瓨鍦ㄥ垯娣诲姞璁板綍
- //涓轰簡淇濊瘉瓒宠抗鐨勬帓搴�,灏嗗師鏈冻杩瑰垹闄ゅ悗閲嶆柊娣诲姞
- List<FootPrint> oldPrints = list(queryWrapper);
- if (oldPrints != null && !oldPrints.isEmpty()) {
- FootPrint oldPrint = oldPrints.get(0);
- this.removeById(oldPrint.getId());
- }
- footPrint.setCreateTime(new Date());
this.save(footPrint);
- //鍒犻櫎瓒呰繃100鏉″悗鐨勮褰�
- this.baseMapper.deleteLastFootPrint(footPrint.getMemberId());
return footPrint;
}
@@ -65,10 +52,11 @@
}
@Override
- public boolean deleteByIds(List<String> ids) {
+ public boolean deleteByIds(List<String> ids, String viewType) {
LambdaQueryWrapper<FootPrint> lambdaQueryWrapper = Wrappers.lambdaQuery();
lambdaQueryWrapper.eq(FootPrint::getMemberId, UserContext.getCurrentUser().getId());
- lambdaQueryWrapper.in(FootPrint::getGoodsId, ids);
+ lambdaQueryWrapper.eq(FootPrint::getViewType, viewType);
+ lambdaQueryWrapper.in(FootPrint::getRefId, ids);
return this.remove(lambdaQueryWrapper);
}
@@ -88,7 +76,7 @@
return null;
}
Optional<FootPrint> first =
- footPrintPages.getRecords().stream().filter(j -> j.getSkuId().equals(goodsSkuByIdFromCache.get(i).getId())).findFirst();
+ footPrintPages.getRecords().stream().filter(j -> goodsSkuByIdFromCache.get(i).getId().equals(j.getSkuId())).findFirst();
return first.map(footPrint -> new EsGoodsIndex(goodsSkuByIdFromCache.get(i), footPrint.getCreateTime())).orElseGet(() -> new EsGoodsIndex(goodsSkuByIdFromCache.get(i)));
})
.collect(Collectors.toList());
@@ -112,4 +100,5 @@
lambdaQueryWrapper.eq(FootPrint::getDeleteFlag, false);
return this.count(lambdaQueryWrapper);
}
-}
\ No newline at end of file
+
+}
--
Gitblit v1.8.0