| @@ -57,23 +57,23 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") | @io.swagger.annotations.ApiModelProperty(value="c用户绑定的手机号",name="cUserPhone") | ||||
| private String 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") | @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") | ||||
| private Date createDate; | private Date createDate; | ||||
| @Transient | @Transient | ||||
| @Excel(name = "面额(元)", width = 20, orderNum = "6") | |||||
| @Excel(name = "面额(元)", width = 20, orderNum = "7") | |||||
| private String priceStr; | private String priceStr; | ||||
| @Transient | @Transient | ||||
| @Excel(name = "交易价格(元)", width = 20, orderNum = "5") | |||||
| @Excel(name = "交易价格(元)", width = 20, orderNum = "6") | |||||
| private String salePriceStr; | private String salePriceStr; | ||||
| @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14") | @Excel(name = "状态", width = 20, replace = {"待使用_0", "已核销_1", "已过期_2", "已退款_3"}, orderNum = "14") | ||||
| @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") | @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") | ||||
| private Integer 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") | @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") | ||||
| private Date 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(); | 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") | @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNumStr") | ||||
| private String subsidyNumStr; | private String subsidyNumStr; | ||||
| @@ -112,11 +112,11 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| private String bUserName; | private String bUserName; | ||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") | @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") | ||||
| private String bUserPhone; | private String bUserPhone; | ||||
| @Excel(name = "商户名", width = 50, orderNum = "3") | |||||
| @Excel(name = "发券商户", width = 50, orderNum = "3") | |||||
| @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") | @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") | ||||
| private String merchantName; | private String merchantName; | ||||
| @Excel(name = "商铺号", width = 50, orderNum = "4") | |||||
| @Excel(name = "商铺号", width = 50, orderNum = "5") | |||||
| @Transient | @Transient | ||||
| private String shopNumber; | private String shopNumber; | ||||
| @@ -146,7 +146,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @Transient | @Transient | ||||
| private Integer couponType; | private Integer couponType; | ||||
| @Excel(name = "核销商户", width = 50, orderNum = "16") | |||||
| @Excel(name = "核销商户", width = 50, orderNum = "4") | |||||
| @Transient | @Transient | ||||
| private String verifyMerchantName; | private String verifyMerchantName; | ||||