44323
2023-10-25 6368a855afb72f3c23eed5aedd085c55fe7a2d9f
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;
//
//        }