From 044546d30b3b242f59a9450935245bec40093324 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 15:49:36 +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 |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 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 7984939..7ad7cdc 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
@@ -914,6 +914,23 @@
                             }
                             //======================================================
                         }
+                    }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);
                     }
 
 

--
Gitblit v1.7.1