From 98e54616161b9caf455587b9cd4610741a0cefed Mon Sep 17 00:00:00 2001 From: gongbiao Date: Fri, 5 Jul 2019 17:44:27 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=88=B8=E8=AE=A2=E5=8D=95][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AF=BC=E5=87=BA=E6=95=B0=E6=8D=AE=E5=88=97?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/domain/vo/WxCouponOrderBVo.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 8af8cc985..57216490b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -57,23 +57,23 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") private String cUserPhone; - @Excel(name = "交易时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "8") + @Excel(name = "交易时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "9") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") private Date createDate; @Transient - @Excel(name = "面额(元)", width = 20, orderNum = "6") + @Excel(name = "面额(元)", width = 20, orderNum = "7") private String priceStr; @Transient - @Excel(name = "交易价格(元)", width = 20, orderNum = "5") + @Excel(name = "交易价格(元)", width = 20, orderNum = "6") private String salePriceStr; @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14") @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") private Integer couponOrderStatus; - @Excel(name = "核销/过期/退款时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "9") + @Excel(name = "核销/过期/退款时间", width = 20, exportFormat = "yyyy-MM-dd HH:mm:ss", orderNum = "10") @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") private Date updateDate; @@ -101,7 +101,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ return new BigDecimal(subsidyNum == null ? 0 : subsidyNum).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_EVEN).toPlainString(); } - @Excel(name = "补贴额(元)", width = 50, orderNum = "7") + @Excel(name = "补贴额(元)", width = 50, orderNum = "8") @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNumStr") private String subsidyNumStr; @@ -112,11 +112,11 @@ public class WxCouponOrderBVo extends WxCouponOrder{ private String bUserName; @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") private String bUserPhone; - @Excel(name = "商户名", width = 50, orderNum = "3") + @Excel(name = "发券商户", width = 50, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") private String merchantName; - @Excel(name = "商铺号", width = 50, orderNum = "4") + @Excel(name = "商铺号", width = 50, orderNum = "5") @Transient private String shopNumber; @@ -146,7 +146,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Transient private Integer couponType; - @Excel(name = "核销商户", width = 50, orderNum = "16") + @Excel(name = "核销商户", width = 50, orderNum = "4") @Transient private String verifyMerchantName;