puzhibing
2023-12-04 3ad6b6ba2ba56fc0bcd2130e47190779c6e15acc
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -287,6 +287,10 @@
    @Autowired
    private PointsMerchandiseStoreService pointsMerchandiseStoreService;
    @Autowired
    private CouponStoreService couponStoreService;
    @ResponseBody
    @PostMapping("/base/pointMerchars/convertGoods")
    public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location) throws Exception {
@@ -324,7 +328,6 @@
        }
//        if (cIds.size()>0) {
        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds)
                .eq("state", 1)
@@ -341,34 +344,37 @@
                integralCommodity.setSort(merchandise.getSort());
                commodity.add(integralCommodity);
            }
//            }
        }
        List<CouponStore> storeId = couponStoreService.list(new QueryWrapper<CouponStore>().eq("storeId", s.getId()));
        List<Integer> storeCoupons = new ArrayList<>();
        for (CouponStore couponStore : storeId) {
            storeCoupons.add(couponStore.getCouponId());
        }
        List<Coupon> list = couponService.list(new QueryWrapper<Coupon>().in("id", storeCoupons).eq("state", 1).gt("endTime", new Date()).last("ORDER BY insertTime desc"));
        if (!list.isEmpty()){
            for (Coupon coupon : list) {
            IntegralCommodity integralCommodity = new IntegralCommodity();
            integralCommodity.setCommodityId(coupon.getId());
            integralCommodity.setCommodityImg(coupon.getCover());
            integralCommodity.setCommodityName(coupon.getName());
            integralCommodity.setCommodityPrice(coupon.getIntegral());
            integralCommodity.setGoodsType(coupon.getType());
//            integralCommodity.setSort(coupon.getSort());
            commodity.add(integralCommodity);
            }
        }
        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<>();
@@ -898,9 +904,9 @@
                                        list3.add(44);
                                        detailsResponse.setRid(list3);
                                    }else {
                                        ArrayList<Integer> list3 = new ArrayList<>();
                                        list3.add(43);
                                        detailsResponse.setRid(list3);
                                        ArrayList<Integer> list4 = new ArrayList<>();
                                        list4.add(43);
                                        detailsResponse.setRid(list4);
                                    }
                                }
                            }