|
|
|
@@ -62,6 +62,9 @@ public class WxOrder implements Serializable { |
|
|
|
/*券状态(3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券 )**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="券状态(3:已领取/已购买/未核销/未使用,4:已核销/已使用,5:已过期,6:已退券 )",name="couponStatus") |
|
|
|
private Integer couponStatus; |
|
|
|
/*卡券过期时间**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="卡券过期时间",name="validDate") |
|
|
|
private Date validDate; |
|
|
|
/*有无退款(0: 无, 1:有)**/ |
|
|
|
@io.swagger.annotations.ApiModelProperty(value="有无退款(0: 无, 1:有)",name="refund") |
|
|
|
private Integer refund; |
|
|
|
@@ -116,6 +119,12 @@ public class WxOrder implements Serializable { |
|
|
|
public void setCouponStatus(Integer _couponStatus) { |
|
|
|
couponStatus = _couponStatus; |
|
|
|
} |
|
|
|
public Date getValidDate() { |
|
|
|
return validDate; |
|
|
|
} |
|
|
|
public void setValidDate(Date _validDate) { |
|
|
|
validDate = _validDate; |
|
|
|
} |
|
|
|
public Integer getRefund() { |
|
|
|
return refund; |
|
|
|
} |
|
|
|
@@ -153,6 +162,7 @@ public class WxOrder implements Serializable { |
|
|
|
,PaymentTime_ASC("`paymentTime` ASC"),PaymentTime_DESC("`paymentTime` DESC") |
|
|
|
,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") |
|
|
|
,CouponStatus_ASC("`couponStatus` ASC"),CouponStatus_DESC("`couponStatus` DESC") |
|
|
|
,ValidDate_ASC("`validDate` ASC"),ValidDate_DESC("`validDate` DESC") |
|
|
|
,Refund_ASC("`refund` ASC"),Refund_DESC("`refund` DESC") |
|
|
|
,RefundTime_ASC("`refundTime` ASC"),RefundTime_DESC("`refundTime` DESC") |
|
|
|
,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") |
|
|
|
@@ -174,7 +184,7 @@ public class WxOrder implements Serializable { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public void setSortColumns(WxOrder.Field... fields) |
|
|
|
public void setSortColumns(Field... fields) |
|
|
|
{ |
|
|
|
if (fields == null || fields.length == 0) { |
|
|
|
return; |
|
|
|
@@ -199,7 +209,7 @@ public class WxOrder implements Serializable { |
|
|
|
} |
|
|
|
if (sortColumns.contains(",")) { |
|
|
|
String[] cols = sortColumns.split(","); |
|
|
|
java.util.List<Field> fList = new java.util.ArrayList(); |
|
|
|
List<Field> fList = new ArrayList(); |
|
|
|
for (int k = 0; k < cols.length; k++) { |
|
|
|
fList.add(Field.valueOf(cols[k])); |
|
|
|
} |
|
|
|
|