From a1e179a3287bf43550a8a2ae1afb7a5513ba0733 Mon Sep 17 00:00:00 2001 From: lin <642018748@qq.com> Date: Thu, 23 Feb 2023 17:46:12 +0800 Subject: [PATCH] fix card --- .../domain/vo/WxCouponPasswordVo.java | 21 +++++++++++-------- .../impl/WxCouponPasswordServiceImpl.java | 1 + 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java index cea226aa4..5476d4d81 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponPasswordVo.java @@ -34,29 +34,32 @@ public class WxCouponPasswordVo extends TenantEntity { @Excel(name = "卡密状态", width = 20, orderNum = "4", replace = {"初始化_0", "消息发送中_1", "消息已发送_2", "已兑换_3","已作废_4"},prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "卡密状态", name = "remainPrice") private Integer status; - @Excel(name = "卡激活状态", width = 20, orderNum = "5",replace = {"未激活_0", "已激活_1"}, prefix = "`") + @Excel(name = "卡密是否停用", width = 20, orderNum = "5", replace = {"否_0", "是_1"},prefix = "`") + @io.swagger.annotations.ApiModelProperty(value = "卡密是否停用", name = "isStop") + private Integer isStop; + @Excel(name = "卡激活状态", width = 20, orderNum = "6",replace = {"未激活_0", "已激活_1"}, prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "卡激活状态EnumYesOrNo", name = "used") private Integer used; - @Excel(name = "激活时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "6") + @Excel(name = "激活时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "7") @io.swagger.annotations.ApiModelProperty(value = "", name = "activeDate") private Date activeDate; - @Excel(name = "激活手机号", width = 20, orderNum = "7", prefix = "`") + @Excel(name = "激活手机号", width = 20, orderNum = "8", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "激活手机号", name = "phone") private String phone; - @Excel(name = "激活会员", width = 20, orderNum = "8", prefix = "`") + @Excel(name = "激活会员", width = 20, orderNum = "9", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "激活会员", name = "userName") private String userName; - @Excel(name = "电子卡卡号", width = 20, orderNum = "9", prefix = "`") + @Excel(name = "电子卡卡号", width = 20, orderNum = "10", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "电子卡卡号", name = "cardId") private Long cardId; - @Excel(name = "面额(元)", width = 20, orderNum = "10", prefix = "`") + @Excel(name = "面额(元)", width = 20, orderNum = "11", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "面额(元)", name = "price") private Double price; - @Excel(name = "余额(元)", width = 20, orderNum = "11", prefix = "`") + @Excel(name = "余额(元)", width = 20, orderNum = "12", prefix = "`") @io.swagger.annotations.ApiModelProperty(value = "余额(元)", name = "remainPrice") private Double remainPrice; - @Excel(name = "激活卡状态", width = 20, orderNum = "12",replace = {"正常_0", "已禁用_1"}, prefix = "`") - @io.swagger.annotations.ApiModelProperty(value = "激活卡状态EnumYesOrNo", name = "used") + @Excel(name = "电子卡状态", width = 20, orderNum = "13",replace = {"正常_0", "已禁用_1"}, prefix = "`") + @io.swagger.annotations.ApiModelProperty(value = "电子卡状态EnumYesOrNo", name = "used") private Integer cardStatus; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java index 53a851c00..fed19d4d9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -147,6 +147,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { } co.setStatus(coo.getStatus()); co.setCreateDate(coo.getCreateDate()); + co.setIsStop(coo.getIsStop()); retList.add(co); } return retList;