From aa45df63fa01b2f010560e4157f00bec5150a1fb Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 27 十一月 2023 17:08:15 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 3d82719..936ea1c 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
@@ -841,22 +841,41 @@
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<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);
+// List<Integer> rid= stoClient.querySiteIdById(collect);
+ //detailsResponse.setRid(rid);
+ // todo 修改区域id 临时
+ // 根据门店id 写死区域id 后续调整为门票指定多个区域
+ // 以下代码均为临时代码
+ for (Integer integer : collect) {
+ ArrayList<Integer> list2 = new ArrayList<>();
+ if (integer==2024){
+ list2.add(32);
+ detailsResponse.setRid(list2);
+ }
+ // 临时 根据门票id 指定的区域
+ if (integer==9919){
+ if (pointsMerchandise.getPointsMerchandiseId()==196||pointsMerchandise.getPointsMerchandiseId()==198){
+ // 返回儿童区id
+ ArrayList<Integer> list3 = new ArrayList<>();
+ list3.add(44);
+ detailsResponse.setRid(list3);
+ }else {
+ ArrayList<Integer> list3 = new ArrayList<>();
+ list3.add(43);
+ detailsResponse.setRid(list3);
+ }
+ }
+ }
}
-
}
-
-
if (merchandise.getCardType()==1){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.7.1