From cc30fb569674fa8f82130253b68ac609ae5d8eb6 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 27 十月 2023 11:46:52 +0800
Subject: [PATCH] 10.27
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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 5f1d859..e49f7a3 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
@@ -676,6 +676,7 @@
if(merchandise.getUseScope()==1){
sids.add(0);
detailsResponse.setSid(sids);
+ detailsResponse.setRid(new ArrayList<>());
}else if(merchandise.getUseScope()==2){
// 指定城市
List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId()));
@@ -685,13 +686,23 @@
}
List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect);
detailsResponse.setSid(storeIds);
+ if(storeIds.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(storeIds);
+ detailsResponse.setRid(rid);
+ }
+
}else if(merchandise.getUseScope()==3){
// 指定门店
List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
detailsResponse.setSid(collect);
-
+ if(collect.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(collect);
+ detailsResponse.setRid(rid);
+ }
}
}
--
Gitblit v1.7.1