From aba8d209561a130b6d849d96ff202fe172b1ad92 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 11 十一月 2025 13:54:33 +0800
Subject: [PATCH] 玩湃本次新增迭代所有代码
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index f2a8644..774b374 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -398,7 +398,7 @@
@PostMapping("/base/pointMerchars/getCommoditys")
public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request) {
-
+ System.err.println("积分商城请求参数"+request);
PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
List<PointsMerchandise> list = new ArrayList<>();
String provinceCode = "";
@@ -436,13 +436,15 @@
pointMerchandiseVo.setMerchandises(list);
return pointMerchandiseVo;
}else{
- List<PointsMerchandise> pointsMerchandiseList = pmdsService.lambdaQuery().in(PointsMerchandise::getId, pointsMerchandiseIds).list();
- list.addAll(pointsMerchandiseList);
- List<PointsMerchandise> listAll = list.stream().distinct().collect(Collectors.toList());
- list = listAll;
+ List<PointsMerchandise> pointsMerchandiseList = pmdsService.lambdaQuery()
+ .eq(PointsMerchandise::getState, 1)
+ .eq(PointsMerchandise::getShelves,1)
+ .in(PointsMerchandise::getId, pointsMerchandiseIds).list();
+
+ list = pointsMerchandiseList;
}
}
-
+ list = list.stream().distinct().collect(Collectors.toList());
if (list.size() > 0) {
Iterator<PointsMerchandise> iterator = list.iterator();
while (iterator.hasNext()) {
--
Gitblit v1.7.1