From f4597f209c50c0ed73a80d8467209a3899cf8136 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 12 三月 2024 09:40:10 +0800
Subject: [PATCH] bug修改

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 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 1a576bf..97c1da0 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
@@ -1709,12 +1709,19 @@
                 }
             }else if (byId.getUseScope()==4){
                 // 如果是指定场地
-                List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
+                List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).distinct().collect(Collectors.toList());
                 int temp =0;
                 List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+                List<Store> stores1 = new ArrayList<>();
+                for (Integer integer : collect) {
+                    List<Integer> list1 = new ArrayList<>();
+                    list1.add(integer);
+                    List<Store> stores = stoClient.queryStoreByIds(list1);
+                    stores1.addAll(stores);
+                }
                 List<Store> stores = stoClient.queryStoreByIds(collect);
                 while (temp!=collect1.size()){
-                    for (Store store : stores) {
+                    for (Store store : stores1) {
                         Integer integer = collect1.get(temp);
                         Site site = siteClient.querySiteById(integer);
                         StoreVos storeVos1 = new StoreVos();

--
Gitblit v1.7.1