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 44fc3f270..c349dc016 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -16,6 +16,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ */ private static final long serialVersionUID = 6687954932922444531L; @Id + @Excel(name="券码",width = 20) protected Long id; @Transient @@ -64,16 +65,43 @@ public class WxCouponOrderBVo extends WxCouponOrder{ /*该订单对应券的实际过期时间**/ @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; - /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ - @Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"},orderNum = "5") - @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") - private Integer couponOrderStatus; + /**商户名**/ + @Excel(name="商户名",width = 50) + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") + private String merchantName; + + /*券名称**/ + @Excel(name="券名称",width = 50) + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + + /**c用户绑定的手机号**/ + @Excel(name="用户手机号",width = 20) + @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") + private String cUserPhone; + /***/ - @Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss",orderNum = "4") + @Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") private Date createDate; + + @Transient + @Excel(name="面额",width = 20) + private String priceStr; + + @Transient + @Excel(name="交易价格",width = 20) + private String salePriceStr; + /***/ + /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ + @Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"}) + @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") @io.swagger.annotations.ApiModelProperty(value = "", name = "updateDate") private Date updateDate; /*单券实际购买价格**/ @@ -84,9 +112,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ /*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/ @io.swagger.annotations.ApiModelProperty(value="券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)",name="type") private Integer type; - /*券名称**/ - @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") - private String title; + /*售价(适用于类型2,3,4,5)**/ @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; @@ -97,28 +123,16 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - /**商户名**/ - @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") - private String merchantName; + /**b端用户姓名**/ + @Excel(name="商户管理员(核销人)姓名",width = 50) @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") private String bUserName; /**b端用户手机号**/ + @Excel(name="商户管理员手机",width = 20) @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") private String bUserPhone; - /**c用户绑定的手机号**/ - @Excel(name="手机号",width = 20,orderNum = "1") - @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") - private String cUserPhone; - - @Transient - @Excel(name="交易价格",width = 20,orderNum = "3") - private String salePriceStr; - - @Transient - @Excel(name="面额",width = 20,orderNum = "2") - private String priceStr; @Transient private Date startDate;