From 1869200173b11ba40149752b648e85af2ab62a1f Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 24 十月 2023 20:44:27 +0800
Subject: [PATCH] 10.24。4

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |   11 +++++++++++
 1 files changed, 11 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 970f217..849004e 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
@@ -193,11 +193,22 @@
     }
 @Resource
 private CoursePackageClient coursePackageClient;
+    @Autowired
+     private PointsMerchandiseService pointsMerchandiseService;
+
     @ResponseBody
     @PostMapping("/base/pointMerchars/getCommoditys")
     public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){
         if (request.getShopId()!=null){
             List<CoursePackage> coursePackages = coursePackageClient.queryByStoreId(request.getShopId());
+            List<Integer> coursIds = new ArrayList<>();
+            for (CoursePackage coursePackage : coursePackages) {
+                coursIds.add(coursePackage.getId());
+            }
+            List<PointsMerchandise> points = pointsMerchandiseService.list(new QueryWrapper<PointsMerchandise>().eq("state",1).eq("shelves",1).in("coursePackageId", coursIds));
+            PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
+            pointMerchandiseVo.setMerchandises(points);
+            return pointMerchandiseVo;
 
         }
 

--
Gitblit v1.7.1