Commit 80ed7bf4 authored by zhangfeng's avatar zhangfeng

客户端兑换记录添加图片,单次兑换礼品积分

parent 5097f231
...@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult; ...@@ -4,7 +4,6 @@ import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent; import cn.iocoder.yudao.framework.idempotent.core.annotation.Idempotent;
import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
import cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi; import cn.iocoder.yudao.module.reward.api.reward.RedeemRewardApi;
import cn.iocoder.yudao.module.reward.api.reward.dto.RedeemRewardRespDTO;
import cn.iocoder.yudao.module.reward.controller.app.redeem.vo.*; import cn.iocoder.yudao.module.reward.controller.app.redeem.vo.*;
import cn.iocoder.yudao.module.reward.service.redeem.RewardRedeemService; import cn.iocoder.yudao.module.reward.service.redeem.RewardRedeemService;
import cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO; import cn.iocoder.yudao.module.reward.vo.reward.RewardRedeemPageRespVO;
......
...@@ -32,6 +32,12 @@ public class AppRewardRedeemDetailRespVO { ...@@ -32,6 +32,12 @@ public class AppRewardRedeemDetailRespVO {
private Date startTime; private Date startTime;
@ApiModelProperty(value = "活动结束日期") @ApiModelProperty(value = "活动结束日期")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "中文礼品图片")
private String imgZh;
@ApiModelProperty(value = "英文礼品图片")
private String imgEn;
@ApiModelProperty(value = "礼品单次兑换所需积分")
private Integer oncePointsRequire;
@ApiModelProperty(value = "兑换方式") @ApiModelProperty(value = "兑换方式")
private Integer redeemType; private Integer redeemType;
@ApiModelProperty(value = "兑换网点(中文)") @ApiModelProperty(value = "兑换网点(中文)")
......
...@@ -47,4 +47,10 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO { ...@@ -47,4 +47,10 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
private Date startTime; private Date startTime;
@ApiModelProperty(value = "活动结束日期") @ApiModelProperty(value = "活动结束日期")
private Date endTime; private Date endTime;
@ApiModelProperty(value = "中文礼品图片")
private String imgZh;
@ApiModelProperty(value = "英文礼品图片")
private String imgEn;
@ApiModelProperty(value = "礼品单次兑换所需积分")
private Integer oncePointsRequire;
} }
...@@ -43,6 +43,9 @@ ...@@ -43,6 +43,9 @@
er.points_require as pointsRequire, er.points_require as pointsRequire,
er.start_time as startTime, er.start_time as startTime,
er.end_time as endTime, er.end_time as endTime,
er.img_zh as imgZh,
er.img_en as imgEn,
er.points_require as oncePointsRequire,
<include refid="columns"/> <include refid="columns"/>
from ecw_reward_redeem err from ecw_reward_redeem err
left join ecw_reward er on err.reward_id = er.id left join ecw_reward er on err.reward_id = er.id
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment