diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java index f10c46dca..ef0db8a0a 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/entity/MkPointsGoods.java @@ -126,5 +126,12 @@ public class MkPointsGoods implements Serializable { * 逻辑删除标志 1-是 0-否 */ private Integer delFlag; + /** + * 优惠券信息 + */ + @Column(ignore = true) + private ShopCoupon couponInfo; + + } 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 7e34e5545..ff4091eb2 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 @@ -4,7 +4,9 @@ import com.czg.BaseQueryParam; import com.czg.exception.CzgException; import com.czg.market.entity.MkPointsGoodsRecord; import com.czg.market.entity.MkPointsUserRecord; +import com.czg.market.entity.ShopCoupon; import com.czg.market.service.MkPointsGoodsRecordService; +import com.czg.market.service.ShopCouponService; import com.czg.order.dto.PointGoodsRefundDTO; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; @@ -31,16 +33,27 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getPointsGoodsPage(BaseQueryParam param, Long shopId) { - return page(Page.of(param.getPage(), param.getSize()), + Page page = page(Page.of(param.getPage(), param.getSize()), query() .eq(MkPointsGoods::getShopId, shopId) .eq(MkPointsGoods::getDelFlag, 0) .orderBy(MkPointsGoods::getSort, false) .orderBy(MkPointsGoods::getId, false) ); + page.getRecords().forEach(goods -> { + if (goods.getGoodsCategory().equals("优惠劵")) { + ShopCoupon one = shopCouponService.getOne(query().eq(ShopCoupon::getId, goods.getCouponId()) + .eq(ShopCoupon::getShopId, shopId) + .eq(ShopCoupon::getIsDel, 0)); + goods.setCouponInfo(one); + } + }); + return page; } @Override @@ -81,7 +94,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl