lostecho/mall-swarm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加订单列表接口

Browse Source
This commit is contained in:
zhh
2018-10-12 15:30:22 +08:00
parent 201960328b
commit 8705320127
16 changed files with 802 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
mall-mbg/src/main/java/com/macro/mall/model/OmsOrder.java
View File

@@ -268,6 +268,41 @@ public class OmsOrder implements Serializable {
*/
private Integer useIntegration;
/**
* 支付时间
*
* @mbggenerated
*/
private Date paymentTime;
/**
* 发货时间
*
* @mbggenerated
*/
private Date deliveryTime;
/**
* 确认收货时间
*
* @mbggenerated
*/
private Date receiveTime;
/**
* 评价时间
*
* @mbggenerated
*/
private Date commentTime;
/**
* 修改时间
*
* @mbggenerated
*/
private Date modifyTime;
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -582,6 +617,46 @@ public class OmsOrder implements Serializable {
this.useIntegration = useIntegration;
}
public Date getPaymentTime() {
return paymentTime;
}
public void setPaymentTime(Date paymentTime) {
this.paymentTime = paymentTime;
}
public Date getDeliveryTime() {
return deliveryTime;
}
public void setDeliveryTime(Date deliveryTime) {
this.deliveryTime = deliveryTime;
}
public Date getReceiveTime() {
return receiveTime;
}
public void setReceiveTime(Date receiveTime) {
this.receiveTime = receiveTime;
}
public Date getCommentTime() {
return commentTime;
}
public void setCommentTime(Date commentTime) {
this.commentTime = commentTime;
}
public Date getModifyTime() {
return modifyTime;
}
public void setModifyTime(Date modifyTime) {
this.modifyTime = modifyTime;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -627,6 +702,11 @@ public class OmsOrder implements Serializable {
sb.append(", confirmStatus=").append(confirmStatus);
sb.append(", deleteStatus=").append(deleteStatus);
sb.append(", useIntegration=").append(useIntegration);
sb.append(", paymentTime=").append(paymentTime);
sb.append(", deliveryTime=").append(deliveryTime);
sb.append(", receiveTime=").append(receiveTime);
sb.append(", commentTime=").append(commentTime);
sb.append(", modifyTime=").append(modifyTime);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

300
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderExample.java
View File

@@ -2615,6 +2615,306 @@ public class OmsOrderExample {
addCriterion("use_integration not between", value1, value2, "useIntegration");
return (Criteria) this;
}
public Criteria andPaymentTimeIsNull() {
addCriterion("payment_time is null");
return (Criteria) this;
}
public Criteria andPaymentTimeIsNotNull() {
addCriterion("payment_time is not null");
return (Criteria) this;
}
public Criteria andPaymentTimeEqualTo(Date value) {
addCriterion("payment_time =", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeNotEqualTo(Date value) {
addCriterion("payment_time <>", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeGreaterThan(Date value) {
addCriterion("payment_time >", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeGreaterThanOrEqualTo(Date value) {
addCriterion("payment_time >=", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeLessThan(Date value) {
addCriterion("payment_time <", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeLessThanOrEqualTo(Date value) {
addCriterion("payment_time <=", value, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeIn(List<Date> values) {
addCriterion("payment_time in", values, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeNotIn(List<Date> values) {
addCriterion("payment_time not in", values, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeBetween(Date value1, Date value2) {
addCriterion("payment_time between", value1, value2, "paymentTime");
return (Criteria) this;
}
public Criteria andPaymentTimeNotBetween(Date value1, Date value2) {
addCriterion("payment_time not between", value1, value2, "paymentTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeIsNull() {
addCriterion("delivery_time is null");
return (Criteria) this;
}
public Criteria andDeliveryTimeIsNotNull() {
addCriterion("delivery_time is not null");
return (Criteria) this;
}
public Criteria andDeliveryTimeEqualTo(Date value) {
addCriterion("delivery_time =", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeNotEqualTo(Date value) {
addCriterion("delivery_time <>", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeGreaterThan(Date value) {
addCriterion("delivery_time >", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeGreaterThanOrEqualTo(Date value) {
addCriterion("delivery_time >=", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeLessThan(Date value) {
addCriterion("delivery_time <", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeLessThanOrEqualTo(Date value) {
addCriterion("delivery_time <=", value, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeIn(List<Date> values) {
addCriterion("delivery_time in", values, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeNotIn(List<Date> values) {
addCriterion("delivery_time not in", values, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeBetween(Date value1, Date value2) {
addCriterion("delivery_time between", value1, value2, "deliveryTime");
return (Criteria) this;
}
public Criteria andDeliveryTimeNotBetween(Date value1, Date value2) {
addCriterion("delivery_time not between", value1, value2, "deliveryTime");
return (Criteria) this;
}
public Criteria andReceiveTimeIsNull() {
addCriterion("receive_time is null");
return (Criteria) this;
}
public Criteria andReceiveTimeIsNotNull() {
addCriterion("receive_time is not null");
return (Criteria) this;
}
public Criteria andReceiveTimeEqualTo(Date value) {
addCriterion("receive_time =", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeNotEqualTo(Date value) {
addCriterion("receive_time <>", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeGreaterThan(Date value) {
addCriterion("receive_time >", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeGreaterThanOrEqualTo(Date value) {
addCriterion("receive_time >=", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeLessThan(Date value) {
addCriterion("receive_time <", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeLessThanOrEqualTo(Date value) {
addCriterion("receive_time <=", value, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeIn(List<Date> values) {
addCriterion("receive_time in", values, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeNotIn(List<Date> values) {
addCriterion("receive_time not in", values, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeBetween(Date value1, Date value2) {
addCriterion("receive_time between", value1, value2, "receiveTime");
return (Criteria) this;
}
public Criteria andReceiveTimeNotBetween(Date value1, Date value2) {
addCriterion("receive_time not between", value1, value2, "receiveTime");
return (Criteria) this;
}
public Criteria andCommentTimeIsNull() {
addCriterion("comment_time is null");
return (Criteria) this;
}
public Criteria andCommentTimeIsNotNull() {
addCriterion("comment_time is not null");
return (Criteria) this;
}
public Criteria andCommentTimeEqualTo(Date value) {
addCriterion("comment_time =", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeNotEqualTo(Date value) {
addCriterion("comment_time <>", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeGreaterThan(Date value) {
addCriterion("comment_time >", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeGreaterThanOrEqualTo(Date value) {
addCriterion("comment_time >=", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeLessThan(Date value) {
addCriterion("comment_time <", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeLessThanOrEqualTo(Date value) {
addCriterion("comment_time <=", value, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeIn(List<Date> values) {
addCriterion("comment_time in", values, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeNotIn(List<Date> values) {
addCriterion("comment_time not in", values, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeBetween(Date value1, Date value2) {
addCriterion("comment_time between", value1, value2, "commentTime");
return (Criteria) this;
}
public Criteria andCommentTimeNotBetween(Date value1, Date value2) {
addCriterion("comment_time not between", value1, value2, "commentTime");
return (Criteria) this;
}
public Criteria andModifyTimeIsNull() {
addCriterion("modify_time is null");
return (Criteria) this;
}
public Criteria andModifyTimeIsNotNull() {
addCriterion("modify_time is not null");
return (Criteria) this;
}
public Criteria andModifyTimeEqualTo(Date value) {
addCriterion("modify_time =", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotEqualTo(Date value) {
addCriterion("modify_time <>", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeGreaterThan(Date value) {
addCriterion("modify_time >", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeGreaterThanOrEqualTo(Date value) {
addCriterion("modify_time >=", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeLessThan(Date value) {
addCriterion("modify_time <", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeLessThanOrEqualTo(Date value) {
addCriterion("modify_time <=", value, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeIn(List<Date> values) {
addCriterion("modify_time in", values, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotIn(List<Date> values) {
addCriterion("modify_time not in", values, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeBetween(Date value1, Date value2) {
addCriterion("modify_time between", value1, value2, "modifyTime");
return (Criteria) this;
}
public Criteria andModifyTimeNotBetween(Date value1, Date value2) {
addCriterion("modify_time not between", value1, value2, "modifyTime");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

17
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReason.java
View File

@@ -1,6 +1,7 @@
package com.macro.mall.model;
import java.io.Serializable;
import java.util.Date;
public class OmsOrderReturnReason implements Serializable {
private Long id;
@@ -21,6 +22,13 @@ public class OmsOrderReturnReason implements Serializable {
*/
private Integer status;
/**
* 添加时间
*
* @mbggenerated
*/
private Date createTime;
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -55,6 +63,14 @@ public class OmsOrderReturnReason implements Serializable {
this.status = status;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -65,6 +81,7 @@ public class OmsOrderReturnReason implements Serializable {
sb.append(", name=").append(name);
sb.append(", sort=").append(sort);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

61
mall-mbg/src/main/java/com/macro/mall/model/OmsOrderReturnReasonExample.java
View File

@@ -1,6 +1,7 @@
package com.macro.mall.model;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
public class OmsOrderReturnReasonExample {
@@ -353,6 +354,66 @@ public class OmsOrderReturnReasonExample {
addCriterion("status not between", value1, value2, "status");
return (Criteria) this;
}
public Criteria andCreateTimeIsNull() {
addCriterion("create_time is null");
return (Criteria) this;
}
public Criteria andCreateTimeIsNotNull() {
addCriterion("create_time is not null");
return (Criteria) this;
}
public Criteria andCreateTimeEqualTo(Date value) {
addCriterion("create_time =", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotEqualTo(Date value) {
addCriterion("create_time <>", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThan(Date value) {
addCriterion("create_time >", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
addCriterion("create_time >=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThan(Date value) {
addCriterion("create_time <", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
addCriterion("create_time <=", value, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeIn(List<Date> values) {
addCriterion("create_time in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotIn(List<Date> values) {
addCriterion("create_time not in", values, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeBetween(Date value1, Date value2) {
addCriterion("create_time between", value1, value2, "createTime");
return (Criteria) this;
}
public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
addCriterion("create_time not between", value1, value2, "createTime");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {