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 | 69 +++++++++++++++++++---------------
1 files changed, 38 insertions(+), 31 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 27f65ba..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
@@ -886,7 +886,7 @@
detailsResponse.setSid(collect);
if (collect.size() > 0) {
// 获取rid
-// List<Integer> rid= stoClient.querySiteIdById(collect);
+// List<Integer> rid= stoClient.querySiteIdById(collect);
//detailsResponse.setRid(rid);
// todo 修改区域id 临时
// 根据门店id 写死区域id 后续调整为门票指定多个区域
@@ -914,22 +914,22 @@
//======================================================
}
}else{
- // todo 返回门店id 和场地id
- // 查询指定场地
- List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
- .eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
- // 门店
- ArrayList<Integer> list3 = new ArrayList<>();
- // 场地
- ArrayList<Integer> list4 = new ArrayList<>();
- for (PointsMerchandiseStore temp : list) {
- Integer storeId = temp.getStoreId();
- Integer siteId = temp.getSiteId();
- list3.add(storeId);
- list4.add(siteId);
- }
- detailsResponse.setRid(list4);
- detailsResponse.setSid(list3);
+ // todo 返回门店id 和场地id
+ // 查询指定场地
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
+ .eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
+ // 门店
+ ArrayList<Integer> list3 = new ArrayList<>();
+ // 场地
+ ArrayList<Integer> list4 = new ArrayList<>();
+ for (PointsMerchandiseStore temp : list) {
+ Integer storeId = temp.getStoreId();
+ Integer siteId = temp.getSiteId();
+ list3.add(storeId);
+ list4.add(siteId);
+ }
+ detailsResponse.setRid(list4);
+ detailsResponse.setSid(list3);
}
@@ -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();
@@ -1803,19 +1810,19 @@
public Boolean addOther(@RequestBody String pam) {
Boolean save = false;
String[] split = pam.split("_");
- if (split.length > 2) {
- if (StringUtils.hasLength(split[2])) {
- for (String s : split[2].split(",")) {
- PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
- pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
- pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
- Site site = siteClient.querySiteById(Integer.valueOf(s));
- pointsMerchandiseStore.setStoreId(site.getStoreId());
- save = pmdstoService.save(pointsMerchandiseStore);
- }
- // 这个门票是选择的场地
- return save;
+ if (split.length>2){
+ if (StringUtils.hasLength(split[2])){
+ for (String s : split[2].split(",")) {
+ PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
+ pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
+ pointsMerchandiseStore.setSiteId(Integer.valueOf(s));
+ Site site = siteClient.querySiteById(Integer.valueOf(s));
+ pointsMerchandiseStore.setStoreId(site.getStoreId());
+ save = pmdstoService.save(pointsMerchandiseStore);
}
+ // 这个门票是选择的场地
+ return save;
+ }
}
for (String s : split[1].split(",")) {
PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
--
Gitblit v1.7.1