diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index f138d883a..d4aa519ab 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -51,6 +51,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl list = mapper.getPointsGoodsPageByUser(shopId, userId, goodsCategory.trim()); + list.forEach(goods -> { + if (goods.getGoodsCategory().equals("优惠劵")) { + ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId()) + .eq(ShopCoupon::getShopId, shopId) + .eq(ShopCoupon::getStatus, 1) + .eq(ShopCoupon::getIsDel, 0)); + goods.setCouponInfo(one); + } + }); result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list))); result.put("pointsUser", pointsUser == null ? "" : pointsUser); return result;