From 0edbc15d102ddcd8ce4001a85583ce920ee22b21 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 25 十月 2023 09:40:30 +0800
Subject: [PATCH] 10.25

---
 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java |   20 +++++++++++++++++++-
 1 files changed, 19 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 ac2c654..7b27028 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
@@ -191,11 +191,29 @@
         System.out.println(commodity);
         return commodity;
     }
-
+@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;
+//
+//        }
+
+
+
         PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
         List<PointsMerchandise> list =  new ArrayList<>();
         String provinceCode = "";

--
Gitblit v1.7.1