| @@ -48,43 +48,53 @@ public class WxOrder implements Serializable { | |||||
| @Transient | @Transient | ||||
| private String phone; | private String phone; | ||||
| /*订单码;正反向交易保持一致。**/ | |||||
| /**订单码;正反向交易保持一致。**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") | @io.swagger.annotations.ApiModelProperty(value="订单码;正反向交易保持一致。",name="orderNumber") | ||||
| private Long orderNumber; | private Long orderNumber; | ||||
| /*租户ID**/ | |||||
| /**租户ID**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | ||||
| private String tenantId; | private String tenantId; | ||||
| /*c端用户id**/ | |||||
| /**c端用户id**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") | @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") | ||||
| private Long cUserId; | private Long cUserId; | ||||
| /*产品ID,根据order type**/ | |||||
| /**产品ID,根据order type**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="产品ID",name="productId") | @io.swagger.annotations.ApiModelProperty(value="产品ID",name="productId") | ||||
| private Long productId; | private Long productId; | ||||
| /*类型0:券,1:B刷卡支付,2:C扫码支付,3:储值卡**/ | |||||
| /**类型0:券,1:B刷卡支付,2:C扫码支付,3:储值卡**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="类型",name="type") | @io.swagger.annotations.ApiModelProperty(value="类型",name="type") | ||||
| private Integer type; | private Integer type; | ||||
| /*0: 付款 1: 退款**/ | |||||
| /**0: 付款 1: 退款**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") | @io.swagger.annotations.ApiModelProperty(value="0: 付款 1: 退款",name="paymentType") | ||||
| private Integer paymentType; | private Integer paymentType; | ||||
| /*支付金额(分):允许有负数,退款时为负值。**/ | |||||
| /**支付金额(分):允许有负数,退款时为负值。**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") | @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") | ||||
| private Integer payment; | private Integer payment; | ||||
| /*支付时间**/ | |||||
| /**支付时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") | @io.swagger.annotations.ApiModelProperty(value="支付时间",name="paymentTime") | ||||
| private Date paymentTime; | private Date paymentTime; | ||||
| /*订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败",name="orderStatus") | |||||
| /**订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款;4-退款失败; 砍价:5-砍价中,6-砍价完成**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="订单状态:-1全部;正向交易:0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款)反向交易:3-已退款; 4-退款失败; 砍价:5-砍价中; 6-砍价完成",name="orderStatus") | |||||
| private Integer orderStatus; | private Integer orderStatus; | ||||
| /*创建时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||||
| /**创建时间/砍价开始时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间/砍价开始时间",name="createDate") | |||||
| private Date createDate; | private Date createDate; | ||||
| /*更新时间**/ | |||||
| /**更新时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | ||||
| private Date updateDate; | private Date updateDate; | ||||
| /*支付描述,订单支付时用**/ | |||||
| /**支付描述,订单支付时用**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="支付描述,订单支付时用",name="detail") | @io.swagger.annotations.ApiModelProperty(value="支付描述,订单支付时用",name="detail") | ||||
| private String detail; | private String detail; | ||||
| /**砍价结束时间**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价结束时间",name="pressEndDate") | |||||
| private Date pressEndDate; | |||||
| /**砍价人数**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="砍价人数",name="pressCurrentNum") | |||||
| private Integer pressCurrentNum; | |||||
| public Long getOrderNumber() { | public Long getOrderNumber() { | ||||
| return orderNumber; | return orderNumber; | ||||
| } | } | ||||
| @@ -188,6 +198,22 @@ public class WxOrder implements Serializable { | |||||
| this.phone = phone; | this.phone = phone; | ||||
| } | } | ||||
| public Date getPressEndDate() { | |||||
| return pressEndDate; | |||||
| } | |||||
| public void setPressEndDate(Date pressEndDate) { | |||||
| this.pressEndDate = pressEndDate; | |||||
| } | |||||
| public Integer getPressCurrentNum() { | |||||
| return pressCurrentNum; | |||||
| } | |||||
| public void setPressCurrentNum(Integer pressCurrentNum) { | |||||
| this.pressCurrentNum = pressCurrentNum; | |||||
| } | |||||
| public static enum Field | public static enum Field | ||||
| { | { | ||||
| Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | Id_ASC("`id` ASC"),Id_DESC("`id` DESC") | ||||