Commit 423791de authored by zhangfeng's avatar zhangfeng

feat-481: 兑换记录列表,添加会员编号查询条件

parent 7c07242b
...@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam { ...@@ -16,6 +16,8 @@ public class RewardRedeemPageReqVO extends PageParam {
private String rewardTitle; private String rewardTitle;
@ApiModelProperty(value = "会员名称") @ApiModelProperty(value = "会员名称")
private String memberName; private String memberName;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "领取方式") @ApiModelProperty(value = "领取方式")
private Integer redeemType; private Integer redeemType;
@ApiModelProperty(value = "状态") @ApiModelProperty(value = "状态")
......
...@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO { ...@@ -15,6 +15,8 @@ public class RewardRedeemPageRespVO extends RewardRedeemBaseVO {
private String memberNameZh; private String memberNameZh;
@ApiModelProperty(value = "会员名称英文") @ApiModelProperty(value = "会员名称英文")
private String memberNameEn; private String memberNameEn;
@ApiModelProperty(value = "会员编号")
private String memberCode;
@ApiModelProperty(value = "礼品ID") @ApiModelProperty(value = "礼品ID")
private String rewardCode; private String rewardCode;
@ApiModelProperty(value = "礼品名称(中文)") @ApiModelProperty(value = "礼品名称(中文)")
......
...@@ -109,6 +109,7 @@ ...@@ -109,6 +109,7 @@
err.verify_time as verifyTime, err.verify_time as verifyTime,
mu.nickname as memberNameZh, mu.nickname as memberNameZh,
mu.english_name as memberNameEn, mu.english_name as memberNameEn,
mu.code as memberCode,
er.code as rewardCode, er.code as rewardCode,
er.title_zh as rewardTitleZh, er.title_zh as rewardTitleZh,
er.title_en as rewardTitleEn, er.title_en as rewardTitleEn,
...@@ -130,6 +131,9 @@ ...@@ -130,6 +131,9 @@
<if test="req.memberName != null and req.memberName !=''"> <if test="req.memberName != null and req.memberName !=''">
and mu.nickname like '%${req.memberName}%' and mu.nickname like '%${req.memberName}%'
</if> </if>
<if test="req.memberCode != null and req.memberCode !=''">
and mu.code = #{req.memberCode}
</if>
<if test="req.rewardCode != null and req.rewardCode !=''"> <if test="req.rewardCode != null and req.rewardCode !=''">
and er.code like '%${req.rewardCode}%' and er.code like '%${req.rewardCode}%'
</if> </if>
......
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