diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java index 81529ae73..681fd8f19 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCardInfo.java @@ -40,7 +40,7 @@ public class WxCardInfo implements Serializable { return new BigDecimal(remainingAmount == null ? 0 : remainingAmount).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "余额(元)", width = 20, orderNum = "6") + @Excel(name = "余额(元)", width = 20, orderNum = "7") @Transient private String remainingAmountStr; @@ -56,7 +56,7 @@ public class WxCardInfo implements Serializable { @io.swagger.annotations.ApiModelProperty(value="分账通道费差(购买时刻的通道费差,分账完结时使用)",name="rateAmount") private Integer rateAmount; - @Excel(name = "购买时间 ", width = 20, orderNum = "9", format = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "购买时间 ", width = 20, orderNum = "10", format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java index d728c03ce..0a474d90b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -25,7 +25,7 @@ public class WxCardVo extends WxCardInfo { @io.swagger.annotations.ApiModelProperty(value="详情多图",name="detailPicture") private String detailPicture; - @Excel(name = "卡名称", width = 20, orderNum = "4") + @Excel(name = "卡名称", width = 20, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") @@ -41,7 +41,7 @@ public class WxCardVo extends WxCardInfo { return new BigDecimal(price == null ? 0 : price).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "面额(元)", width = 20, orderNum = "5") + @Excel(name = "面额(元)", width = 20, orderNum = "6") @Transient private String priceStr; @@ -53,7 +53,7 @@ public class WxCardVo extends WxCardInfo { return new BigDecimal(salePrice == null ? 0 : salePrice).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "售价(元)", width = 20, orderNum = "7") + @Excel(name = "售价(元)", width = 20, orderNum = "8") @Transient private String salePriceStr; @@ -66,7 +66,7 @@ public class WxCardVo extends WxCardInfo { return new BigDecimal(subsidyNum == null ? 0 : subsidyNum).divide(new BigDecimal(100)).toPlainString(); } - @Excel(name = "补贴额(元)", width = 20, orderNum = "8") + @Excel(name = "补贴额(元)", width = 20, orderNum = "9") @Transient private String subsidyNumStr; @@ -81,7 +81,7 @@ public class WxCardVo extends WxCardInfo { @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - @Excel(name = "状态 ", width = 20, orderNum = "10", replace = {"使用中_4", "已过期_5", "已用完_6", "已线下退款_7"}) + @Excel(name = "状态 ", width = 20, orderNum = "11", replace = {"使用中_4", "已过期_5", "已用完_6", "已线下退款_7"}) @io.swagger.annotations.ApiModelProperty(value = "状态", name = "status") private Integer status; @@ -89,10 +89,12 @@ public class WxCardVo extends WxCardInfo { @Excel(name = "购买人", width = 20, orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cnickName") private String cnickName; + + @Excel(name = "持卡人", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="onickName") private String onickName; - @Excel(name = "电话", width = 20, orderNum = "3") + @Excel(name = "电话", width = 20, orderNum = "4") @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="ouPhone") private String ouPhone;