|
|
|
@@ -8,6 +8,7 @@ import lombok.Data; |
|
|
|
import lombok.EqualsAndHashCode; |
|
|
|
import lombok.ToString; |
|
|
|
|
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
@@ -23,6 +24,10 @@ public class WxOrder extends BaseEntity { |
|
|
|
@TableField(exist = false) |
|
|
|
private String merchantName; |
|
|
|
|
|
|
|
public String getcUserName() { |
|
|
|
return cUserName; |
|
|
|
} |
|
|
|
|
|
|
|
@Excel(name = "会员", width = 20, orderNum = "2") |
|
|
|
@TableField(exist = false) |
|
|
|
private String cUserName; |
|
|
|
@@ -47,13 +52,12 @@ public class WxOrder extends BaseEntity { |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") |
|
|
|
private Integer paymentType; |
|
|
|
|
|
|
|
@Excel(name = "订单金额(元)", width = 20, orderNum = "6") |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") |
|
|
|
private Integer payment; |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") |
|
|
|
private Date paymentTime; |
|
|
|
|
|
|
|
@Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5"}) |
|
|
|
@Excel(name = "订单状态", width = 20, orderNum = "9", replace = {"待付款_0", "已支付_1", "已取消_2", "待退款_3", "已退款_4", "退款失败_5", " _-1"}) |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款; 4-退款失败,5-退款失败; 砍价:6-砍价中,7-砍价完成,8-砍价失败",name="orderStatus") |
|
|
|
private Integer orderStatus; |
|
|
|
|
|
|
|
@@ -95,11 +99,27 @@ public class WxOrder extends BaseEntity { |
|
|
|
@TableField(exist = false) |
|
|
|
private String title; |
|
|
|
|
|
|
|
@Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4"}) |
|
|
|
@Excel(name = "商品属性", width = 20, orderNum = "4", replace = {"消费卡_1", "优惠券_2", "砍价_3", "拼团_4", " _-1"}) |
|
|
|
@TableField(exist = false) |
|
|
|
private Integer attribute; |
|
|
|
|
|
|
|
@Excel(name = "支付金额(元)", width = 20, orderNum = "8") |
|
|
|
@TableField(exist = false) |
|
|
|
private Integer pay; |
|
|
|
|
|
|
|
@Excel(name = "支付金额(元)", width = 20, orderNum = "8") |
|
|
|
@TableField(exist = false) |
|
|
|
private String payStr; |
|
|
|
|
|
|
|
public String getPayStr() { |
|
|
|
return pay != null ? new BigDecimal(pay).divide(new BigDecimal(100)).toPlainString() : payStr; |
|
|
|
} |
|
|
|
|
|
|
|
public String getPaymentStr() { |
|
|
|
return payment != null ? new BigDecimal(payment).divide(new BigDecimal(100)).toPlainString() : payStr; |
|
|
|
} |
|
|
|
|
|
|
|
@Excel(name = "订单金额(元)", width = 20, orderNum = "6") |
|
|
|
@TableField(exist = false) |
|
|
|
private String paymentStr; |
|
|
|
|
|
|
|
} |