java/PlayPai.git

			@@ -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 {
			@@ -342,6 +346,25 @@
			}
			}

			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);