From a1557f3f07287c86e8a4a408f03ba19993e5a48c Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期三, 25 十月 2023 09:41:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 14 +++++++++++++- 1 files changed, 13 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 9af0f39..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,23 @@ } @Resource private CoursePackageClient coursePackageClient; + @Autowired + private PointsMerchandiseService pointsMerchandiseService; + @ResponseBody @PostMapping("/base/pointMerchars/getCommoditys") public PointMerchandiseVo getVicinityGoods(@RequestBody CommodityRequest request){ if (request.getShopId()!=null){ - CoursePackage coursePackage = coursePackageClient.queryByStoreId(request.getShopId()); + 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