diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java index 8656c7d4..066c2467 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/entity/CouponUse.java @@ -14,6 +14,7 @@ import com.skyeye.common.entity.features.OperatorUserInfo; import lombok.Data; import java.util.List; +import java.util.Map; /** * @ClassName: CouponUse @@ -36,6 +37,10 @@ public class CouponUse extends OperatorUserInfo { @ApiModelProperty(value = "优惠券id", required = "required") private String couponId; + @TableField(exist = false) + @Property(value = "优惠券信息") + private Map couponMation; + @TableField(value = "state") @Property(value = "状态,参考#CouponUseState") private Integer state; diff --git a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java index fc8f6421..e036c135 100644 --- a/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java +++ b/skyeye-shop/shop-store/src/main/java/com/skyeye/coupon/service/impl/CouponServiceImpl.java @@ -185,8 +185,8 @@ public class CouponServiceImpl extends SkyeyeBusinessServiceImpl> queryPageDataList(InputObject inputObject) { + List> mapList = super.queryPageDataList(inputObject); + couponService.setMationForMap(mapList, "couponId", "couponMation"); + return mapList; + } + @Override public List> queryDataList(InputObject inputObject) { Map params = inputObject.getParams(); @@ -159,6 +166,7 @@ public class CouponUseServiceImpl extends SkyeyeBusinessServiceImpl list = list(queryWrapper); + couponService.setDataMation(list, CouponUse::getCouponId); return JSONUtil.toList(JSONUtil.toJsonStr(list), null); }