From 50a4e8cae497f7b5071df1153365a776cc9c6a5f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 16:55:23 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 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 83b204e..1a576bf 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
@@ -909,7 +909,6 @@
list4.add(43);
detailsResponse.setRid(list4);
}
-
}
}
//======================================================
@@ -1682,33 +1681,62 @@
List<StoreVos> storeVos = new ArrayList<>();
List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
.eq("pointsMerchandiseId", id));
- if (list.size() > 0) {
- List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
- List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
- List<Store> stores = stoClient.queryStoreByIds(collect);
- if (stores.size() > 0) {
- int a = 0;
- for (Store store : stores) {
- StoreVos storeVos1 = new StoreVos();
- storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
- if (store.getOperatorId()==null){
- storeVos1.setNum2("平台");
- }else if (store.getOperatorId() == 0) {
- storeVos1.setNum2("平台");
- } else {
+ PointsMerchandise byId = pmdsService.getById(id);
- storeVos1.setNum2(store.getOName());
+ if (list.size() > 0) {
+
+ if (byId.getUseScope()==3){
+ // 如果是指定门店
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ if (stores.size() > 0) {
+ int a = 0;
+ for (Store store : stores) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
+ if (store.getOperatorId()==null){
+ storeVos1.setNum2("平台");
+ }else if (store.getOperatorId() == 0) {
+ storeVos1.setNum2("平台");
+ } else {
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
+ storeVos.add(storeVos1);
}
- storeVos1.setNum3(store.getName());
- storeVos1.setNum4(store.getIds());
- if (collect1.get(a)!=null){
- Site site = siteClient.querySiteById(collect1.get(a));
- storeVos1.setNum5(site.getName());
- }
- storeVos1.setNum4(store.getIds());
- storeVos.add(storeVos1);
}
+ }else if (byId.getUseScope()==4){
+ // 如果是指定场地
+ List<Integer> collect1 = list.stream().map(PointsMerchandiseStore::getSiteId).collect(Collectors.toList());
+ int temp =0;
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ while (temp!=collect1.size()){
+ for (Store store : stores) {
+ Integer integer = collect1.get(temp);
+ Site site = siteClient.querySiteById(integer);
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum5(site.getName());
+ storeVos1.setNum1(store.getProvince() + "省" + store.getCity() + "市");
+ if (store.getOperatorId()==null){
+ storeVos1.setNum2("平台");
+ }else if (store.getOperatorId() == 0) {
+ storeVos1.setNum2("平台");
+ } else {
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
+ storeVos.add(storeVos1);
+ temp++;
+ }
+ }
+
+
}
+
}
return storeVos;
}
--
Gitblit v1.7.1