diff --git a/litemall-db/sql/litemall_table.sql b/litemall-db/sql/litemall_table.sql index adf776ed..326d81ab 100644 --- a/litemall-db/sql/litemall_table.sql +++ b/litemall-db/sql/litemall_table.sql @@ -540,6 +540,10 @@ CREATE TABLE `litemall_order` ( `ship_sn` varchar(63) DEFAULT NULL COMMENT '发货编号', `ship_channel` varchar(63) DEFAULT NULL COMMENT '发货快递公司', `ship_time` datetime DEFAULT NULL COMMENT '发货开始时间', + `refund_amount` decimal(10,2) DEFAULT NULL COMMENT '实际退款金额，（有可能退款金额小于实际支付金额）', + `refund_type` varchar(63) DEFAULT NULL COMMENT '退款方式', + `refund_content` varchar(127) DEFAULT NULL COMMENT '退款备注', + `refund_time` datetime DEFAULT NULL COMMENT '退款时间', `confirm_time` datetime DEFAULT NULL COMMENT '用户确认收货时间', `comments` smallint(6) DEFAULT '0' COMMENT '待评价订单商品数量', `end_time` datetime DEFAULT NULL COMMENT '订单关闭时间', @@ -691,7 +695,7 @@ CREATE TABLE `litemall_system` ( `update_time` datetime DEFAULT NULL COMMENT '更新时间', `deleted` tinyint(1) DEFAULT '0' COMMENT '逻辑删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统配置表'; +) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='系统配置表'; /*!40101 SET character_set_client = @saved_cs_client */; -- @@ -779,4 +783,4 @@ CREATE TABLE `litemall_user_formid` ( /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; --- Dump completed on 2018-12-10 16:59:09 +-- Dump completed on 2019-12-16 23:12:57 diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java index a56e1813..5f834799 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrder.java @@ -202,6 +202,42 @@ public class LitemallOrder { */ private LocalDateTime shipTime; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_order.refund_amount + * + * @mbg.generated + */ + private BigDecimal refundAmount; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_order.refund_type + * + * @mbg.generated + */ + private String refundType; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_order.refund_content + * + * @mbg.generated + */ + private String refundContent; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_order.refund_time + * + * @mbg.generated + */ + private LocalDateTime refundTime; + /** * * This field was generated by MyBatis Generator. @@ -736,6 +772,102 @@ public class LitemallOrder { this.shipTime = shipTime; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_order.refund_amount + * + * @return the value of litemall_order.refund_amount + * + * @mbg.generated + */ + public BigDecimal getRefundAmount() { + return refundAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_order.refund_amount + * + * @param refundAmount the value for litemall_order.refund_amount + * + * @mbg.generated + */ + public void setRefundAmount(BigDecimal refundAmount) { + this.refundAmount = refundAmount; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_order.refund_type + * + * @return the value of litemall_order.refund_type + * + * @mbg.generated + */ + public String getRefundType() { + return refundType; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_order.refund_type + * + * @param refundType the value for litemall_order.refund_type + * + * @mbg.generated + */ + public void setRefundType(String refundType) { + this.refundType = refundType; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_order.refund_content + * + * @return the value of litemall_order.refund_content + * + * @mbg.generated + */ + public String getRefundContent() { + return refundContent; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_order.refund_content + * + * @param refundContent the value for litemall_order.refund_content + * + * @mbg.generated + */ + public void setRefundContent(String refundContent) { + this.refundContent = refundContent; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_order.refund_time + * + * @return the value of litemall_order.refund_time + * + * @mbg.generated + */ + public LocalDateTime getRefundTime() { + return refundTime; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_order.refund_time + * + * @param refundTime the value for litemall_order.refund_time + * + * @mbg.generated + */ + public void setRefundTime(LocalDateTime refundTime) { + this.refundTime = refundTime; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_order.confirm_time @@ -924,6 +1056,10 @@ public class LitemallOrder { sb.append(", shipSn=").append(shipSn); sb.append(", shipChannel=").append(shipChannel); sb.append(", shipTime=").append(shipTime); + sb.append(", refundAmount=").append(refundAmount); + sb.append(", refundType=").append(refundType); + sb.append(", refundContent=").append(refundContent); + sb.append(", refundTime=").append(refundTime); sb.append(", confirmTime=").append(confirmTime); sb.append(", comments=").append(comments); sb.append(", endTime=").append(endTime); @@ -972,6 +1108,10 @@ public class LitemallOrder { && (this.getShipSn() == null ? other.getShipSn() == null : this.getShipSn().equals(other.getShipSn())) && (this.getShipChannel() == null ? other.getShipChannel() == null : this.getShipChannel().equals(other.getShipChannel())) && (this.getShipTime() == null ? other.getShipTime() == null : this.getShipTime().equals(other.getShipTime())) + && (this.getRefundAmount() == null ? other.getRefundAmount() == null : this.getRefundAmount().equals(other.getRefundAmount())) + && (this.getRefundType() == null ? other.getRefundType() == null : this.getRefundType().equals(other.getRefundType())) + && (this.getRefundContent() == null ? other.getRefundContent() == null : this.getRefundContent().equals(other.getRefundContent())) + && (this.getRefundTime() == null ? other.getRefundTime() == null : this.getRefundTime().equals(other.getRefundTime())) && (this.getConfirmTime() == null ? other.getConfirmTime() == null : this.getConfirmTime().equals(other.getConfirmTime())) && (this.getComments() == null ? other.getComments() == null : this.getComments().equals(other.getComments())) && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) @@ -1010,6 +1150,10 @@ public class LitemallOrder { result = prime * result + ((getShipSn() == null) ? 0 : getShipSn().hashCode()); result = prime * result + ((getShipChannel() == null) ? 0 : getShipChannel().hashCode()); result = prime * result + ((getShipTime() == null) ? 0 : getShipTime().hashCode()); + result = prime * result + ((getRefundAmount() == null) ? 0 : getRefundAmount().hashCode()); + result = prime * result + ((getRefundType() == null) ? 0 : getRefundType().hashCode()); + result = prime * result + ((getRefundContent() == null) ? 0 : getRefundContent().hashCode()); + result = prime * result + ((getRefundTime() == null) ? 0 : getRefundTime().hashCode()); result = prime * result + ((getConfirmTime() == null) ? 0 : getConfirmTime().hashCode()); result = prime * result + ((getComments() == null) ? 0 : getComments().hashCode()); result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); @@ -1114,6 +1258,10 @@ public class LitemallOrder { shipSn("ship_sn", "shipSn", "VARCHAR", false), shipChannel("ship_channel", "shipChannel", "VARCHAR", false), shipTime("ship_time", "shipTime", "TIMESTAMP", false), + refundAmount("refund_amount", "refundAmount", "DECIMAL", false), + refundType("refund_type", "refundType", "VARCHAR", false), + refundContent("refund_content", "refundContent", "VARCHAR", false), + refundTime("refund_time", "refundTime", "TIMESTAMP", false), confirmTime("confirm_time", "confirmTime", "TIMESTAMP", false), comments("comments", "comments", "SMALLINT", false), endTime("end_time", "endTime", "TIMESTAMP", false), diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderExample.java index 9a163746..7108e1f9 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderExample.java @@ -2864,6 +2864,530 @@ public class LitemallOrderExample { return (Criteria) this; } + public Criteria andRefundAmountIsNull() { + addCriterion("refund_amount is null"); + return (Criteria) this; + } + + public Criteria andRefundAmountIsNotNull() { + addCriterion("refund_amount is not null"); + return (Criteria) this; + } + + public Criteria andRefundAmountEqualTo(BigDecimal value) { + addCriterion("refund_amount =", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount = ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountNotEqualTo(BigDecimal value) { + addCriterion("refund_amount <>", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountNotEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount <> ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountGreaterThan(BigDecimal value) { + addCriterion("refund_amount >", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountGreaterThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount > ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("refund_amount >=", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountGreaterThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount >= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountLessThan(BigDecimal value) { + addCriterion("refund_amount <", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountLessThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount < ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountLessThanOrEqualTo(BigDecimal value) { + addCriterion("refund_amount <=", value, "refundAmount"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundAmountLessThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_amount <= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundAmountIn(List values) { + addCriterion("refund_amount in", values, "refundAmount"); + return (Criteria) this; + } + + public Criteria andRefundAmountNotIn(List values) { + addCriterion("refund_amount not in", values, "refundAmount"); + return (Criteria) this; + } + + public Criteria andRefundAmountBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("refund_amount between", value1, value2, "refundAmount"); + return (Criteria) this; + } + + public Criteria andRefundAmountNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("refund_amount not between", value1, value2, "refundAmount"); + return (Criteria) this; + } + + public Criteria andRefundTypeIsNull() { + addCriterion("refund_type is null"); + return (Criteria) this; + } + + public Criteria andRefundTypeIsNotNull() { + addCriterion("refund_type is not null"); + return (Criteria) this; + } + + public Criteria andRefundTypeEqualTo(String value) { + addCriterion("refund_type =", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type = ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeNotEqualTo(String value) { + addCriterion("refund_type <>", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeNotEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type <> ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeGreaterThan(String value) { + addCriterion("refund_type >", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeGreaterThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type > ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeGreaterThanOrEqualTo(String value) { + addCriterion("refund_type >=", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeGreaterThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type >= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeLessThan(String value) { + addCriterion("refund_type <", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeLessThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type < ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeLessThanOrEqualTo(String value) { + addCriterion("refund_type <=", value, "refundType"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTypeLessThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_type <= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTypeLike(String value) { + addCriterion("refund_type like", value, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundTypeNotLike(String value) { + addCriterion("refund_type not like", value, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundTypeIn(List values) { + addCriterion("refund_type in", values, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundTypeNotIn(List values) { + addCriterion("refund_type not in", values, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundTypeBetween(String value1, String value2) { + addCriterion("refund_type between", value1, value2, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundTypeNotBetween(String value1, String value2) { + addCriterion("refund_type not between", value1, value2, "refundType"); + return (Criteria) this; + } + + public Criteria andRefundContentIsNull() { + addCriterion("refund_content is null"); + return (Criteria) this; + } + + public Criteria andRefundContentIsNotNull() { + addCriterion("refund_content is not null"); + return (Criteria) this; + } + + public Criteria andRefundContentEqualTo(String value) { + addCriterion("refund_content =", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content = ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentNotEqualTo(String value) { + addCriterion("refund_content <>", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentNotEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content <> ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentGreaterThan(String value) { + addCriterion("refund_content >", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentGreaterThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content > ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentGreaterThanOrEqualTo(String value) { + addCriterion("refund_content >=", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentGreaterThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content >= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentLessThan(String value) { + addCriterion("refund_content <", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentLessThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content < ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentLessThanOrEqualTo(String value) { + addCriterion("refund_content <=", value, "refundContent"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundContentLessThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_content <= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundContentLike(String value) { + addCriterion("refund_content like", value, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundContentNotLike(String value) { + addCriterion("refund_content not like", value, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundContentIn(List values) { + addCriterion("refund_content in", values, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundContentNotIn(List values) { + addCriterion("refund_content not in", values, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundContentBetween(String value1, String value2) { + addCriterion("refund_content between", value1, value2, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundContentNotBetween(String value1, String value2) { + addCriterion("refund_content not between", value1, value2, "refundContent"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNull() { + addCriterion("refund_time is null"); + return (Criteria) this; + } + + public Criteria andRefundTimeIsNotNull() { + addCriterion("refund_time is not null"); + return (Criteria) this; + } + + public Criteria andRefundTimeEqualTo(LocalDateTime value) { + addCriterion("refund_time =", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time = ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeNotEqualTo(LocalDateTime value) { + addCriterion("refund_time <>", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeNotEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time <> ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThan(LocalDateTime value) { + addCriterion("refund_time >", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeGreaterThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time > ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeGreaterThanOrEqualTo(LocalDateTime value) { + addCriterion("refund_time >=", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeGreaterThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time >= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThan(LocalDateTime value) { + addCriterion("refund_time <", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeLessThanColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time < ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeLessThanOrEqualTo(LocalDateTime value) { + addCriterion("refund_time <=", value, "refundTime"); + return (Criteria) this; + } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + */ + public Criteria andRefundTimeLessThanOrEqualToColumn(LitemallOrder.Column column) { + addCriterion(new StringBuilder("refund_time <= ").append(column.getEscapedColumnName()).toString()); + return (Criteria) this; + } + + public Criteria andRefundTimeIn(List values) { + addCriterion("refund_time in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotIn(List values) { + addCriterion("refund_time not in", values, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeBetween(LocalDateTime value1, LocalDateTime value2) { + addCriterion("refund_time between", value1, value2, "refundTime"); + return (Criteria) this; + } + + public Criteria andRefundTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { + addCriterion("refund_time not between", value1, value2, "refundTime"); + return (Criteria) this; + } + public Criteria andConfirmTimeIsNull() { addCriterion("confirm_time is null"); return (Criteria) this; diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml index be20786b..c177e419 100644 --- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml +++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallOrderMapper.xml @@ -26,6 +26,10 @@ + + + + @@ -106,8 +110,8 @@ --> id, user_id, order_sn, order_status, consignee, mobile, address, message, goods_price, freight_price, coupon_price, integral_price, groupon_price, order_price, actual_price, - pay_id, pay_time, ship_sn, ship_channel, ship_time, confirm_time, comments, end_time, - add_time, update_time, deleted + pay_id, pay_time, ship_sn, ship_channel, ship_time, refund_amount, refund_type, refund_content, + refund_time, confirm_time, comments, end_time, add_time, update_time, deleted