From 6368a855afb72f3c23eed5aedd085c55fe7a2d9f Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 10:02:43 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 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 849004e..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
@@ -199,18 +199,18 @@
@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;
-
- }
+// 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