diff --git a/litemall-db/mybatis-generator/generatorConfig.xml b/litemall-db/mybatis-generator/generatorConfig.xml index 49390e4b..b83abcec 100644 --- a/litemall-db/mybatis-generator/generatorConfig.xml +++ b/litemall-db/mybatis-generator/generatorConfig.xml @@ -67,7 +67,6 @@ -
@@ -76,7 +75,7 @@
- +
@@ -92,14 +91,6 @@
- - - - - - - -
@@ -129,19 +120,18 @@ - - +
- +
- +
@@ -158,6 +148,7 @@
+
@@ -166,12 +157,5 @@
- - - - -
- - \ No newline at end of file diff --git a/litemall-db/pom.xml b/litemall-db/pom.xml index 659a5877..e26d65a3 100644 --- a/litemall-db/pom.xml +++ b/litemall-db/pom.xml @@ -78,7 +78,7 @@ com.itfsw mybatis-generator-plugin - 1.2.3 + 1.2.6 diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallCouponMapper.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallCouponMapper.java deleted file mode 100644 index 83785c6f..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallCouponMapper.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.linlinjava.litemall.db.dao; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import org.linlinjava.litemall.db.domain.LitemallCoupon; -import org.linlinjava.litemall.db.domain.LitemallCouponExample; - -public interface LitemallCouponMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - long countByExample(LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int deleteByExample(LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int deleteByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int insert(LitemallCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int insertSelective(LitemallCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallCoupon selectOneByExample(LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallCoupon selectOneByExampleSelective(@Param("example") LitemallCouponExample example, @Param("selective") LitemallCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - List selectByExampleSelective(@Param("example") LitemallCouponExample example, @Param("selective") LitemallCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - List selectByExample(LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallCoupon selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") LitemallCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - LitemallCoupon selectByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallCoupon selectByPrimaryKeyWithLogicalDelete(@Param("id") Integer id, @Param("andLogicalDeleted") boolean andLogicalDeleted); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int updateByExampleSelective(@Param("record") LitemallCoupon record, @Param("example") LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int updateByExample(@Param("record") LitemallCoupon record, @Param("example") LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int updateByPrimaryKeySelective(LitemallCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - int updateByPrimaryKey(LitemallCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - int logicalDeleteByExample(@Param("example") LitemallCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - int logicalDeleteByPrimaryKey(Integer id); -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.java deleted file mode 100644 index 6e8c1a37..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/dao/LitemallUserCouponMapper.java +++ /dev/null @@ -1,159 +0,0 @@ -package org.linlinjava.litemall.db.dao; - -import java.util.List; -import org.apache.ibatis.annotations.Param; -import org.linlinjava.litemall.db.domain.LitemallUserCoupon; -import org.linlinjava.litemall.db.domain.LitemallUserCouponExample; - -public interface LitemallUserCouponMapper { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - long countByExample(LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int deleteByExample(LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int deleteByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int insert(LitemallUserCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int insertSelective(LitemallUserCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallUserCoupon selectOneByExample(LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallUserCoupon selectOneByExampleSelective(@Param("example") LitemallUserCouponExample example, @Param("selective") LitemallUserCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - List selectByExampleSelective(@Param("example") LitemallUserCouponExample example, @Param("selective") LitemallUserCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - List selectByExample(LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallUserCoupon selectByPrimaryKeySelective(@Param("id") Integer id, @Param("selective") LitemallUserCoupon.Column ... selective); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - LitemallUserCoupon selectByPrimaryKey(Integer id); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - LitemallUserCoupon selectByPrimaryKeyWithLogicalDelete(@Param("id") Integer id, @Param("andLogicalDeleted") boolean andLogicalDeleted); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int updateByExampleSelective(@Param("record") LitemallUserCoupon record, @Param("example") LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int updateByExample(@Param("record") LitemallUserCoupon record, @Param("example") LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int updateByPrimaryKeySelective(LitemallUserCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - int updateByPrimaryKey(LitemallUserCoupon record); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - int logicalDeleteByExample(@Param("example") LitemallUserCouponExample example); - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - int logicalDeleteByPrimaryKey(Integer id); -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAd.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAd.java index e36b8919..768322cc 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAd.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAd.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallAd { /** @@ -12,16 +14,6 @@ public class LitemallAd { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_ad - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_ad @@ -31,16 +23,6 @@ public class LitemallAd { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_ad - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -50,15 +32,6 @@ public class LitemallAd { */ private Integer id; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_ad.position - * - * @mbg.generated - */ - private Integer position; - /** * * This field was generated by MyBatis Generator. @@ -86,6 +59,15 @@ public class LitemallAd { */ private String url; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_ad.position + * + * @mbg.generated + */ + private Byte position; + /** * * This field was generated by MyBatis Generator. @@ -164,30 +146,6 @@ public class LitemallAd { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_ad.position - * - * @return the value of litemall_ad.position - * - * @mbg.generated - */ - public Integer getPosition() { - return position; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_ad.position - * - * @param position the value for litemall_ad.position - * - * @mbg.generated - */ - public void setPosition(Integer position) { - this.position = position; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_ad.name @@ -260,6 +218,30 @@ public class LitemallAd { this.url = url; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_ad.position + * + * @return the value of litemall_ad.position + * + * @mbg.generated + */ + public Byte getPosition() { + return position; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_ad.position + * + * @param position the value for litemall_ad.position + * + * @mbg.generated + */ + public void setPosition(Byte position) { + this.position = position; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_ad.content @@ -417,10 +399,10 @@ public class LitemallAd { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", position=").append(position); sb.append(", name=").append(name); sb.append(", link=").append(link); sb.append(", url=").append(url); + sb.append(", position=").append(position); sb.append(", content=").append(content); sb.append(", startTime=").append(startTime); sb.append(", endTime=").append(endTime); @@ -450,10 +432,10 @@ public class LitemallAd { } LitemallAd other = (LitemallAd) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getPosition() == null ? other.getPosition() == null : this.getPosition().equals(other.getPosition())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getLink() == null ? other.getLink() == null : this.getLink().equals(other.getLink())) && (this.getUrl() == null ? other.getUrl() == null : this.getUrl().equals(other.getUrl())) + && (this.getPosition() == null ? other.getPosition() == null : this.getPosition().equals(other.getPosition())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())) && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime())) && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) @@ -473,10 +455,10 @@ public class LitemallAd { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getPosition() == null) ? 0 : getPosition().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getLink() == null) ? 0 : getLink().hashCode()); result = prime * result + ((getUrl() == null) ? 0 : getUrl().hashCode()); + result = prime * result + ((getPosition() == null) ? 0 : getPosition().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode()); result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); @@ -506,10 +488,10 @@ public class LitemallAd { */ public enum Column { id("id", "id", "INTEGER"), - position("position", "position", "INTEGER"), name("name", "name", "VARCHAR"), link("link", "link", "VARCHAR"), url("url", "url", "VARCHAR"), + position("position", "position", "TINYINT"), content("content", "content", "VARCHAR"), startTime("start_time", "startTime", "TIMESTAMP"), endTime("end_time", "endTime", "TIMESTAMP"), @@ -622,5 +604,20 @@ public class LitemallAd { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_ad + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdExample.java index e1dfdf75..9c01b27a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdExample.java @@ -286,66 +286,6 @@ public class LitemallAdExample { return (Criteria) this; } - public Criteria andPositionIsNull() { - addCriterion("`position` is null"); - return (Criteria) this; - } - - public Criteria andPositionIsNotNull() { - addCriterion("`position` is not null"); - return (Criteria) this; - } - - public Criteria andPositionEqualTo(Integer value) { - addCriterion("`position` =", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionNotEqualTo(Integer value) { - addCriterion("`position` <>", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionGreaterThan(Integer value) { - addCriterion("`position` >", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionGreaterThanOrEqualTo(Integer value) { - addCriterion("`position` >=", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionLessThan(Integer value) { - addCriterion("`position` <", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionLessThanOrEqualTo(Integer value) { - addCriterion("`position` <=", value, "position"); - return (Criteria) this; - } - - public Criteria andPositionIn(List values) { - addCriterion("`position` in", values, "position"); - return (Criteria) this; - } - - public Criteria andPositionNotIn(List values) { - addCriterion("`position` not in", values, "position"); - return (Criteria) this; - } - - public Criteria andPositionBetween(Integer value1, Integer value2) { - addCriterion("`position` between", value1, value2, "position"); - return (Criteria) this; - } - - public Criteria andPositionNotBetween(Integer value1, Integer value2) { - addCriterion("`position` not between", value1, value2, "position"); - return (Criteria) this; - } - public Criteria andNameIsNull() { addCriterion("`name` is null"); return (Criteria) this; @@ -556,6 +496,66 @@ public class LitemallAdExample { return (Criteria) this; } + public Criteria andPositionIsNull() { + addCriterion("`position` is null"); + return (Criteria) this; + } + + public Criteria andPositionIsNotNull() { + addCriterion("`position` is not null"); + return (Criteria) this; + } + + public Criteria andPositionEqualTo(Byte value) { + addCriterion("`position` =", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotEqualTo(Byte value) { + addCriterion("`position` <>", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionGreaterThan(Byte value) { + addCriterion("`position` >", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionGreaterThanOrEqualTo(Byte value) { + addCriterion("`position` >=", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionLessThan(Byte value) { + addCriterion("`position` <", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionLessThanOrEqualTo(Byte value) { + addCriterion("`position` <=", value, "position"); + return (Criteria) this; + } + + public Criteria andPositionIn(List values) { + addCriterion("`position` in", values, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotIn(List values) { + addCriterion("`position` not in", values, "position"); + return (Criteria) this; + } + + public Criteria andPositionBetween(Byte value1, Byte value2) { + addCriterion("`position` between", value1, value2, "position"); + return (Criteria) this; + } + + public Criteria andPositionNotBetween(Byte value1, Byte value2) { + addCriterion("`position` not between", value1, value2, "position"); + return (Criteria) this; + } + public Criteria andContentIsNull() { addCriterion("content is null"); return (Criteria) this; @@ -991,18 +991,6 @@ public class LitemallAdExample { return deleted ? andDeletedEqualTo(LitemallAd.IS_DELETED) : andDeletedNotEqualTo(LitemallAd.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_ad - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallAd.IS_DELETED) : andDeletedNotEqualTo(LitemallAd.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_ad diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java index cf02f8d9..8bb14095 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddress.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallAddress { /** @@ -12,16 +14,6 @@ public class LitemallAddress { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_address - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_address @@ -31,16 +23,6 @@ public class LitemallAddress { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_address - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -622,5 +604,20 @@ public class LitemallAddress { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_address + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddressExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddressExample.java index aa12fa9c..6f3e6d40 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddressExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAddressExample.java @@ -981,18 +981,6 @@ public class LitemallAddressExample { return deleted ? andDeletedEqualTo(LitemallAddress.IS_DELETED) : andDeletedNotEqualTo(LitemallAddress.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_address - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallAddress.IS_DELETED) : andDeletedNotEqualTo(LitemallAddress.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_address diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdmin.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdmin.java index 7c733cd4..e615fbe1 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdmin.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdmin.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallAdmin { /** @@ -12,16 +14,6 @@ public class LitemallAdmin { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_admin - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_admin @@ -31,16 +23,6 @@ public class LitemallAdmin { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_admin - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -86,15 +68,6 @@ public class LitemallAdmin { */ private LocalDateTime lastLoginTime; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_admin.update_time - * - * @mbg.generated - */ - private LocalDateTime updateTime; - /** * * This field was generated by MyBatis Generator. @@ -242,30 +215,6 @@ public class LitemallAdmin { this.lastLoginTime = lastLoginTime; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_admin.update_time - * - * @return the value of litemall_admin.update_time - * - * @mbg.generated - */ - public LocalDateTime getUpdateTime() { - return updateTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_admin.update_time - * - * @param updateTime the value for litemall_admin.update_time - * - * @mbg.generated - */ - public void setUpdateTime(LocalDateTime updateTime) { - this.updateTime = updateTime; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_admin.avatar @@ -355,7 +304,6 @@ public class LitemallAdmin { sb.append(", password=").append(password); sb.append(", lastLoginIp=").append(lastLoginIp); sb.append(", lastLoginTime=").append(lastLoginTime); - sb.append(", updateTime=").append(updateTime); sb.append(", avatar=").append(avatar); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); @@ -386,7 +334,6 @@ public class LitemallAdmin { && (this.getPassword() == null ? other.getPassword() == null : this.getPassword().equals(other.getPassword())) && (this.getLastLoginIp() == null ? other.getLastLoginIp() == null : this.getLastLoginIp().equals(other.getLastLoginIp())) && (this.getLastLoginTime() == null ? other.getLastLoginTime() == null : this.getLastLoginTime().equals(other.getLastLoginTime())) - && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); @@ -407,7 +354,6 @@ public class LitemallAdmin { result = prime * result + ((getPassword() == null) ? 0 : getPassword().hashCode()); result = prime * result + ((getLastLoginIp() == null) ? 0 : getLastLoginIp().hashCode()); result = prime * result + ((getLastLoginTime() == null) ? 0 : getLastLoginTime().hashCode()); - result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); @@ -438,7 +384,6 @@ public class LitemallAdmin { password("password", "password", "VARCHAR"), lastLoginIp("last_login_ip", "lastLoginIp", "VARCHAR"), lastLoginTime("last_login_time", "lastLoginTime", "TIMESTAMP"), - updateTime("update_time", "updateTime", "TIMESTAMP"), avatar("avatar", "avatar", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -548,5 +493,20 @@ public class LitemallAdmin { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_admin + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdminExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdminExample.java index dd94872d..7392a1c7 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdminExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallAdminExample.java @@ -556,66 +556,6 @@ public class LitemallAdminExample { return (Criteria) this; } - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(LocalDateTime value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(LocalDateTime value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(LocalDateTime value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(LocalDateTime value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - public Criteria andAvatarIsNull() { addCriterion("avatar is null"); return (Criteria) this; @@ -871,18 +811,6 @@ public class LitemallAdminExample { return deleted ? andDeletedEqualTo(LitemallAdmin.IS_DELETED) : andDeletedNotEqualTo(LitemallAdmin.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_admin - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallAdmin.IS_DELETED) : andDeletedNotEqualTo(LitemallAdmin.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_admin diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrand.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrand.java index 21afd775..04f86fb8 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrand.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrand.java @@ -2,6 +2,8 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallBrand { /** @@ -13,16 +15,6 @@ public class LitemallBrand { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_brand - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_brand @@ -32,16 +24,6 @@ public class LitemallBrand { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_brand - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -63,20 +45,11 @@ public class LitemallBrand { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.list_pic_url + * This field corresponds to the database column litemall_brand.desc * * @mbg.generated */ - private String listPicUrl; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.simple_desc - * - * @mbg.generated - */ - private String simpleDesc; + private String desc; /** * @@ -96,15 +69,6 @@ public class LitemallBrand { */ private Byte sortOrder; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.is_show - * - * @mbg.generated - */ - private Boolean isShow; - /** * * This field was generated by MyBatis Generator. @@ -114,42 +78,6 @@ public class LitemallBrand { */ private BigDecimal floorPrice; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.app_list_pic_url - * - * @mbg.generated - */ - private String appListPicUrl; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.is_new - * - * @mbg.generated - */ - private Boolean isNew; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.new_pic_url - * - * @mbg.generated - */ - private String newPicUrl; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_brand.new_sort_order - * - * @mbg.generated - */ - private Byte newSortOrder; - /** * * This field was generated by MyBatis Generator. @@ -218,50 +146,26 @@ public class LitemallBrand { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.list_pic_url + * This method returns the value of the database column litemall_brand.desc * - * @return the value of litemall_brand.list_pic_url + * @return the value of litemall_brand.desc * * @mbg.generated */ - public String getListPicUrl() { - return listPicUrl; + public String getDesc() { + return desc; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.list_pic_url + * This method sets the value of the database column litemall_brand.desc * - * @param listPicUrl the value for litemall_brand.list_pic_url + * @param desc the value for litemall_brand.desc * * @mbg.generated */ - public void setListPicUrl(String listPicUrl) { - this.listPicUrl = listPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.simple_desc - * - * @return the value of litemall_brand.simple_desc - * - * @mbg.generated - */ - public String getSimpleDesc() { - return simpleDesc; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.simple_desc - * - * @param simpleDesc the value for litemall_brand.simple_desc - * - * @mbg.generated - */ - public void setSimpleDesc(String simpleDesc) { - this.simpleDesc = simpleDesc; + public void setDesc(String desc) { + this.desc = desc; } /** @@ -312,30 +216,6 @@ public class LitemallBrand { this.sortOrder = sortOrder; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.is_show - * - * @return the value of litemall_brand.is_show - * - * @mbg.generated - */ - public Boolean getIsShow() { - return isShow; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.is_show - * - * @param isShow the value for litemall_brand.is_show - * - * @mbg.generated - */ - public void setIsShow(Boolean isShow) { - this.isShow = isShow; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_brand.floor_price @@ -360,102 +240,6 @@ public class LitemallBrand { this.floorPrice = floorPrice; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.app_list_pic_url - * - * @return the value of litemall_brand.app_list_pic_url - * - * @mbg.generated - */ - public String getAppListPicUrl() { - return appListPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.app_list_pic_url - * - * @param appListPicUrl the value for litemall_brand.app_list_pic_url - * - * @mbg.generated - */ - public void setAppListPicUrl(String appListPicUrl) { - this.appListPicUrl = appListPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.is_new - * - * @return the value of litemall_brand.is_new - * - * @mbg.generated - */ - public Boolean getIsNew() { - return isNew; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.is_new - * - * @param isNew the value for litemall_brand.is_new - * - * @mbg.generated - */ - public void setIsNew(Boolean isNew) { - this.isNew = isNew; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.new_pic_url - * - * @return the value of litemall_brand.new_pic_url - * - * @mbg.generated - */ - public String getNewPicUrl() { - return newPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.new_pic_url - * - * @param newPicUrl the value for litemall_brand.new_pic_url - * - * @mbg.generated - */ - public void setNewPicUrl(String newPicUrl) { - this.newPicUrl = newPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_brand.new_sort_order - * - * @return the value of litemall_brand.new_sort_order - * - * @mbg.generated - */ - public Byte getNewSortOrder() { - return newSortOrder; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_brand.new_sort_order - * - * @param newSortOrder the value for litemall_brand.new_sort_order - * - * @mbg.generated - */ - public void setNewSortOrder(Byte newSortOrder) { - this.newSortOrder = newSortOrder; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_brand.add_time @@ -518,16 +302,10 @@ public class LitemallBrand { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", name=").append(name); - sb.append(", listPicUrl=").append(listPicUrl); - sb.append(", simpleDesc=").append(simpleDesc); + sb.append(", desc=").append(desc); sb.append(", picUrl=").append(picUrl); sb.append(", sortOrder=").append(sortOrder); - sb.append(", isShow=").append(isShow); sb.append(", floorPrice=").append(floorPrice); - sb.append(", appListPicUrl=").append(appListPicUrl); - sb.append(", isNew=").append(isNew); - sb.append(", newPicUrl=").append(newPicUrl); - sb.append(", newSortOrder=").append(newSortOrder); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append("]"); @@ -554,16 +332,10 @@ public class LitemallBrand { LitemallBrand other = (LitemallBrand) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getListPicUrl() == null ? other.getListPicUrl() == null : this.getListPicUrl().equals(other.getListPicUrl())) - && (this.getSimpleDesc() == null ? other.getSimpleDesc() == null : this.getSimpleDesc().equals(other.getSimpleDesc())) + && (this.getDesc() == null ? other.getDesc() == null : this.getDesc().equals(other.getDesc())) && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) - && (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow())) && (this.getFloorPrice() == null ? other.getFloorPrice() == null : this.getFloorPrice().equals(other.getFloorPrice())) - && (this.getAppListPicUrl() == null ? other.getAppListPicUrl() == null : this.getAppListPicUrl().equals(other.getAppListPicUrl())) - && (this.getIsNew() == null ? other.getIsNew() == null : this.getIsNew().equals(other.getIsNew())) - && (this.getNewPicUrl() == null ? other.getNewPicUrl() == null : this.getNewPicUrl().equals(other.getNewPicUrl())) - && (this.getNewSortOrder() == null ? other.getNewSortOrder() == null : this.getNewSortOrder().equals(other.getNewSortOrder())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); } @@ -580,16 +352,10 @@ public class LitemallBrand { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getListPicUrl() == null) ? 0 : getListPicUrl().hashCode()); - result = prime * result + ((getSimpleDesc() == null) ? 0 : getSimpleDesc().hashCode()); + result = prime * result + ((getDesc() == null) ? 0 : getDesc().hashCode()); result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); - result = prime * result + ((getIsShow() == null) ? 0 : getIsShow().hashCode()); result = prime * result + ((getFloorPrice() == null) ? 0 : getFloorPrice().hashCode()); - result = prime * result + ((getAppListPicUrl() == null) ? 0 : getAppListPicUrl().hashCode()); - result = prime * result + ((getIsNew() == null) ? 0 : getIsNew().hashCode()); - result = prime * result + ((getNewPicUrl() == null) ? 0 : getNewPicUrl().hashCode()); - result = prime * result + ((getNewSortOrder() == null) ? 0 : getNewSortOrder().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); return result; @@ -616,16 +382,10 @@ public class LitemallBrand { public enum Column { id("id", "id", "INTEGER"), name("name", "name", "VARCHAR"), - listPicUrl("list_pic_url", "listPicUrl", "VARCHAR"), - simpleDesc("simple_desc", "simpleDesc", "VARCHAR"), + desc("desc", "desc", "VARCHAR"), picUrl("pic_url", "picUrl", "VARCHAR"), sortOrder("sort_order", "sortOrder", "TINYINT"), - isShow("is_show", "isShow", "BIT"), floorPrice("floor_price", "floorPrice", "DECIMAL"), - appListPicUrl("app_list_pic_url", "appListPicUrl", "VARCHAR"), - isNew("is_new", "isNew", "BIT"), - newPicUrl("new_pic_url", "newPicUrl", "VARCHAR"), - newSortOrder("new_sort_order", "newSortOrder", "TINYINT"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -734,5 +494,20 @@ public class LitemallBrand { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_brand + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrandExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrandExample.java index 7b7cd00c..b304d3dc 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrandExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallBrandExample.java @@ -357,143 +357,73 @@ public class LitemallBrandExample { return (Criteria) this; } - public Criteria andListPicUrlIsNull() { - addCriterion("list_pic_url is null"); + public Criteria andDescIsNull() { + addCriterion("`desc` is null"); return (Criteria) this; } - public Criteria andListPicUrlIsNotNull() { - addCriterion("list_pic_url is not null"); + public Criteria andDescIsNotNull() { + addCriterion("`desc` is not null"); return (Criteria) this; } - public Criteria andListPicUrlEqualTo(String value) { - addCriterion("list_pic_url =", value, "listPicUrl"); + public Criteria andDescEqualTo(String value) { + addCriterion("`desc` =", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlNotEqualTo(String value) { - addCriterion("list_pic_url <>", value, "listPicUrl"); + public Criteria andDescNotEqualTo(String value) { + addCriterion("`desc` <>", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlGreaterThan(String value) { - addCriterion("list_pic_url >", value, "listPicUrl"); + public Criteria andDescGreaterThan(String value) { + addCriterion("`desc` >", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("list_pic_url >=", value, "listPicUrl"); + public Criteria andDescGreaterThanOrEqualTo(String value) { + addCriterion("`desc` >=", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlLessThan(String value) { - addCriterion("list_pic_url <", value, "listPicUrl"); + public Criteria andDescLessThan(String value) { + addCriterion("`desc` <", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlLessThanOrEqualTo(String value) { - addCriterion("list_pic_url <=", value, "listPicUrl"); + public Criteria andDescLessThanOrEqualTo(String value) { + addCriterion("`desc` <=", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlLike(String value) { - addCriterion("list_pic_url like", value, "listPicUrl"); + public Criteria andDescLike(String value) { + addCriterion("`desc` like", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlNotLike(String value) { - addCriterion("list_pic_url not like", value, "listPicUrl"); + public Criteria andDescNotLike(String value) { + addCriterion("`desc` not like", value, "desc"); return (Criteria) this; } - public Criteria andListPicUrlIn(List values) { - addCriterion("list_pic_url in", values, "listPicUrl"); + public Criteria andDescIn(List values) { + addCriterion("`desc` in", values, "desc"); return (Criteria) this; } - public Criteria andListPicUrlNotIn(List values) { - addCriterion("list_pic_url not in", values, "listPicUrl"); + public Criteria andDescNotIn(List values) { + addCriterion("`desc` not in", values, "desc"); return (Criteria) this; } - public Criteria andListPicUrlBetween(String value1, String value2) { - addCriterion("list_pic_url between", value1, value2, "listPicUrl"); + public Criteria andDescBetween(String value1, String value2) { + addCriterion("`desc` between", value1, value2, "desc"); return (Criteria) this; } - public Criteria andListPicUrlNotBetween(String value1, String value2) { - addCriterion("list_pic_url not between", value1, value2, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andSimpleDescIsNull() { - addCriterion("simple_desc is null"); - return (Criteria) this; - } - - public Criteria andSimpleDescIsNotNull() { - addCriterion("simple_desc is not null"); - return (Criteria) this; - } - - public Criteria andSimpleDescEqualTo(String value) { - addCriterion("simple_desc =", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescNotEqualTo(String value) { - addCriterion("simple_desc <>", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescGreaterThan(String value) { - addCriterion("simple_desc >", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescGreaterThanOrEqualTo(String value) { - addCriterion("simple_desc >=", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescLessThan(String value) { - addCriterion("simple_desc <", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescLessThanOrEqualTo(String value) { - addCriterion("simple_desc <=", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescLike(String value) { - addCriterion("simple_desc like", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescNotLike(String value) { - addCriterion("simple_desc not like", value, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescIn(List values) { - addCriterion("simple_desc in", values, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescNotIn(List values) { - addCriterion("simple_desc not in", values, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescBetween(String value1, String value2) { - addCriterion("simple_desc between", value1, value2, "simpleDesc"); - return (Criteria) this; - } - - public Criteria andSimpleDescNotBetween(String value1, String value2) { - addCriterion("simple_desc not between", value1, value2, "simpleDesc"); + public Criteria andDescNotBetween(String value1, String value2) { + addCriterion("`desc` not between", value1, value2, "desc"); return (Criteria) this; } @@ -627,66 +557,6 @@ public class LitemallBrandExample { return (Criteria) this; } - public Criteria andIsShowIsNull() { - addCriterion("is_show is null"); - return (Criteria) this; - } - - public Criteria andIsShowIsNotNull() { - addCriterion("is_show is not null"); - return (Criteria) this; - } - - public Criteria andIsShowEqualTo(Boolean value) { - addCriterion("is_show =", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotEqualTo(Boolean value) { - addCriterion("is_show <>", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThan(Boolean value) { - addCriterion("is_show >", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_show >=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThan(Boolean value) { - addCriterion("is_show <", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThanOrEqualTo(Boolean value) { - addCriterion("is_show <=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowIn(List values) { - addCriterion("is_show in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotIn(List values) { - addCriterion("is_show not in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowBetween(Boolean value1, Boolean value2) { - addCriterion("is_show between", value1, value2, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_show not between", value1, value2, "isShow"); - return (Criteria) this; - } - public Criteria andFloorPriceIsNull() { addCriterion("floor_price is null"); return (Criteria) this; @@ -747,266 +617,6 @@ public class LitemallBrandExample { return (Criteria) this; } - public Criteria andAppListPicUrlIsNull() { - addCriterion("app_list_pic_url is null"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlIsNotNull() { - addCriterion("app_list_pic_url is not null"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlEqualTo(String value) { - addCriterion("app_list_pic_url =", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlNotEqualTo(String value) { - addCriterion("app_list_pic_url <>", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlGreaterThan(String value) { - addCriterion("app_list_pic_url >", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("app_list_pic_url >=", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlLessThan(String value) { - addCriterion("app_list_pic_url <", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlLessThanOrEqualTo(String value) { - addCriterion("app_list_pic_url <=", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlLike(String value) { - addCriterion("app_list_pic_url like", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlNotLike(String value) { - addCriterion("app_list_pic_url not like", value, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlIn(List values) { - addCriterion("app_list_pic_url in", values, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlNotIn(List values) { - addCriterion("app_list_pic_url not in", values, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlBetween(String value1, String value2) { - addCriterion("app_list_pic_url between", value1, value2, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andAppListPicUrlNotBetween(String value1, String value2) { - addCriterion("app_list_pic_url not between", value1, value2, "appListPicUrl"); - return (Criteria) this; - } - - public Criteria andIsNewIsNull() { - addCriterion("is_new is null"); - return (Criteria) this; - } - - public Criteria andIsNewIsNotNull() { - addCriterion("is_new is not null"); - return (Criteria) this; - } - - public Criteria andIsNewEqualTo(Boolean value) { - addCriterion("is_new =", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewNotEqualTo(Boolean value) { - addCriterion("is_new <>", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewGreaterThan(Boolean value) { - addCriterion("is_new >", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_new >=", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewLessThan(Boolean value) { - addCriterion("is_new <", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewLessThanOrEqualTo(Boolean value) { - addCriterion("is_new <=", value, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewIn(List values) { - addCriterion("is_new in", values, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewNotIn(List values) { - addCriterion("is_new not in", values, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewBetween(Boolean value1, Boolean value2) { - addCriterion("is_new between", value1, value2, "isNew"); - return (Criteria) this; - } - - public Criteria andIsNewNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_new not between", value1, value2, "isNew"); - return (Criteria) this; - } - - public Criteria andNewPicUrlIsNull() { - addCriterion("new_pic_url is null"); - return (Criteria) this; - } - - public Criteria andNewPicUrlIsNotNull() { - addCriterion("new_pic_url is not null"); - return (Criteria) this; - } - - public Criteria andNewPicUrlEqualTo(String value) { - addCriterion("new_pic_url =", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlNotEqualTo(String value) { - addCriterion("new_pic_url <>", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlGreaterThan(String value) { - addCriterion("new_pic_url >", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("new_pic_url >=", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlLessThan(String value) { - addCriterion("new_pic_url <", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlLessThanOrEqualTo(String value) { - addCriterion("new_pic_url <=", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlLike(String value) { - addCriterion("new_pic_url like", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlNotLike(String value) { - addCriterion("new_pic_url not like", value, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlIn(List values) { - addCriterion("new_pic_url in", values, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlNotIn(List values) { - addCriterion("new_pic_url not in", values, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlBetween(String value1, String value2) { - addCriterion("new_pic_url between", value1, value2, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewPicUrlNotBetween(String value1, String value2) { - addCriterion("new_pic_url not between", value1, value2, "newPicUrl"); - return (Criteria) this; - } - - public Criteria andNewSortOrderIsNull() { - addCriterion("new_sort_order is null"); - return (Criteria) this; - } - - public Criteria andNewSortOrderIsNotNull() { - addCriterion("new_sort_order is not null"); - return (Criteria) this; - } - - public Criteria andNewSortOrderEqualTo(Byte value) { - addCriterion("new_sort_order =", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderNotEqualTo(Byte value) { - addCriterion("new_sort_order <>", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderGreaterThan(Byte value) { - addCriterion("new_sort_order >", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderGreaterThanOrEqualTo(Byte value) { - addCriterion("new_sort_order >=", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderLessThan(Byte value) { - addCriterion("new_sort_order <", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderLessThanOrEqualTo(Byte value) { - addCriterion("new_sort_order <=", value, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderIn(List values) { - addCriterion("new_sort_order in", values, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderNotIn(List values) { - addCriterion("new_sort_order not in", values, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderBetween(Byte value1, Byte value2) { - addCriterion("new_sort_order between", value1, value2, "newSortOrder"); - return (Criteria) this; - } - - public Criteria andNewSortOrderNotBetween(Byte value1, Byte value2) { - addCriterion("new_sort_order not between", value1, value2, "newSortOrder"); - return (Criteria) this; - } - public Criteria andAddTimeIsNull() { addCriterion("add_time is null"); return (Criteria) this; @@ -1192,18 +802,6 @@ public class LitemallBrandExample { return deleted ? andDeletedEqualTo(LitemallBrand.IS_DELETED) : andDeletedNotEqualTo(LitemallBrand.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_brand - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallBrand.IS_DELETED) : andDeletedNotEqualTo(LitemallBrand.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_brand diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCart.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCart.java index 15711ceb..5d263049 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCart.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCart.java @@ -2,6 +2,7 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; public class LitemallCart { @@ -14,16 +15,6 @@ public class LitemallCart { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_cart - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_cart @@ -33,16 +24,6 @@ public class LitemallCart { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_cart - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -79,15 +60,6 @@ public class LitemallCart { */ private String goodsSn; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_cart.product_id - * - * @mbg.generated - */ - private Integer productId; - /** * * This field was generated by MyBatis Generator. @@ -100,11 +72,20 @@ public class LitemallCart { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_cart.retail_price + * This field corresponds to the database column litemall_cart.product_id * * @mbg.generated */ - private BigDecimal retailPrice; + private Integer productId; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_cart.price + * + * @mbg.generated + */ + private BigDecimal price; /** * @@ -118,20 +99,11 @@ public class LitemallCart { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_cart.goods_specification_values + * This field corresponds to the database column litemall_cart.specifications * * @mbg.generated */ - private String goodsSpecificationValues; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_cart.goods_specification_ids - * - * @mbg.generated - */ - private Integer[] goodsSpecificationIds; + private String[] specifications; /** * @@ -265,30 +237,6 @@ public class LitemallCart { this.goodsSn = goodsSn; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_cart.product_id - * - * @return the value of litemall_cart.product_id - * - * @mbg.generated - */ - public Integer getProductId() { - return productId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_cart.product_id - * - * @param productId the value for litemall_cart.product_id - * - * @mbg.generated - */ - public void setProductId(Integer productId) { - this.productId = productId; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_cart.goods_name @@ -315,26 +263,50 @@ public class LitemallCart { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_cart.retail_price + * This method returns the value of the database column litemall_cart.product_id * - * @return the value of litemall_cart.retail_price + * @return the value of litemall_cart.product_id * * @mbg.generated */ - public BigDecimal getRetailPrice() { - return retailPrice; + public Integer getProductId() { + return productId; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_cart.retail_price + * This method sets the value of the database column litemall_cart.product_id * - * @param retailPrice the value for litemall_cart.retail_price + * @param productId the value for litemall_cart.product_id * * @mbg.generated */ - public void setRetailPrice(BigDecimal retailPrice) { - this.retailPrice = retailPrice; + public void setProductId(Integer productId) { + this.productId = productId; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_cart.price + * + * @return the value of litemall_cart.price + * + * @mbg.generated + */ + public BigDecimal getPrice() { + return price; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_cart.price + * + * @param price the value for litemall_cart.price + * + * @mbg.generated + */ + public void setPrice(BigDecimal price) { + this.price = price; } /** @@ -363,50 +335,26 @@ public class LitemallCart { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_cart.goods_specification_values + * This method returns the value of the database column litemall_cart.specifications * - * @return the value of litemall_cart.goods_specification_values + * @return the value of litemall_cart.specifications * * @mbg.generated */ - public String getGoodsSpecificationValues() { - return goodsSpecificationValues; + public String[] getSpecifications() { + return specifications; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_cart.goods_specification_values + * This method sets the value of the database column litemall_cart.specifications * - * @param goodsSpecificationValues the value for litemall_cart.goods_specification_values + * @param specifications the value for litemall_cart.specifications * * @mbg.generated */ - public void setGoodsSpecificationValues(String goodsSpecificationValues) { - this.goodsSpecificationValues = goodsSpecificationValues; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_cart.goods_specification_ids - * - * @return the value of litemall_cart.goods_specification_ids - * - * @mbg.generated - */ - public Integer[] getGoodsSpecificationIds() { - return goodsSpecificationIds; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_cart.goods_specification_ids - * - * @param goodsSpecificationIds the value for litemall_cart.goods_specification_ids - * - * @mbg.generated - */ - public void setGoodsSpecificationIds(Integer[] goodsSpecificationIds) { - this.goodsSpecificationIds = goodsSpecificationIds; + public void setSpecifications(String[] specifications) { + this.specifications = specifications; } /** @@ -521,12 +469,11 @@ public class LitemallCart { sb.append(", userId=").append(userId); sb.append(", goodsId=").append(goodsId); sb.append(", goodsSn=").append(goodsSn); - sb.append(", productId=").append(productId); sb.append(", goodsName=").append(goodsName); - sb.append(", retailPrice=").append(retailPrice); + sb.append(", productId=").append(productId); + sb.append(", price=").append(price); sb.append(", number=").append(number); - sb.append(", goodsSpecificationValues=").append(goodsSpecificationValues); - sb.append(", goodsSpecificationIds=").append(goodsSpecificationIds); + sb.append(", specifications=").append(specifications); sb.append(", checked=").append(checked); sb.append(", picUrl=").append(picUrl); sb.append(", addTime=").append(addTime); @@ -557,12 +504,11 @@ public class LitemallCart { && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) && (this.getGoodsSn() == null ? other.getGoodsSn() == null : this.getGoodsSn().equals(other.getGoodsSn())) - && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId())) && (this.getGoodsName() == null ? other.getGoodsName() == null : this.getGoodsName().equals(other.getGoodsName())) - && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice())) + && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) && (this.getNumber() == null ? other.getNumber() == null : this.getNumber().equals(other.getNumber())) - && (this.getGoodsSpecificationValues() == null ? other.getGoodsSpecificationValues() == null : this.getGoodsSpecificationValues().equals(other.getGoodsSpecificationValues())) - && (Arrays.equals(this.getGoodsSpecificationIds(), other.getGoodsSpecificationIds())) + && (Arrays.equals(this.getSpecifications(), other.getSpecifications())) && (this.getChecked() == null ? other.getChecked() == null : this.getChecked().equals(other.getChecked())) && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) @@ -583,12 +529,11 @@ public class LitemallCart { result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); result = prime * result + ((getGoodsSn() == null) ? 0 : getGoodsSn().hashCode()); - result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode()); result = prime * result + ((getGoodsName() == null) ? 0 : getGoodsName().hashCode()); - result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode()); + result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode()); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); result = prime * result + ((getNumber() == null) ? 0 : getNumber().hashCode()); - result = prime * result + ((getGoodsSpecificationValues() == null) ? 0 : getGoodsSpecificationValues().hashCode()); - result = prime * result + (Arrays.hashCode(getGoodsSpecificationIds())); + result = prime * result + (Arrays.hashCode(getSpecifications())); result = prime * result + ((getChecked() == null) ? 0 : getChecked().hashCode()); result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); @@ -619,12 +564,11 @@ public class LitemallCart { userId("user_id", "userId", "INTEGER"), goodsId("goods_id", "goodsId", "INTEGER"), goodsSn("goods_sn", "goodsSn", "VARCHAR"), - productId("product_id", "productId", "INTEGER"), goodsName("goods_name", "goodsName", "VARCHAR"), - retailPrice("retail_price", "retailPrice", "DECIMAL"), + productId("product_id", "productId", "INTEGER"), + price("price", "price", "DECIMAL"), number("number", "number", "SMALLINT"), - goodsSpecificationValues("goods_specification_values", "goodsSpecificationValues", "VARCHAR"), - goodsSpecificationIds("goods_specification_ids", "goodsSpecificationIds", "CHAR"), + specifications("specifications", "specifications", "VARCHAR"), checked("checked", "checked", "BIT"), picUrl("pic_url", "picUrl", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), @@ -735,5 +679,20 @@ public class LitemallCart { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_cart + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCartExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCartExample.java index ded773cc..3c3c7bb4 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCartExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCartExample.java @@ -187,7 +187,7 @@ public class LitemallCartExample { * @mbg.generated */ protected abstract static class GeneratedCriteria { - protected List goodsSpecificationIdsCriteria; + protected List specificationsCriteria; protected List allCriteria; @@ -196,39 +196,39 @@ public class LitemallCartExample { protected GeneratedCriteria() { super(); criteria = new ArrayList(); - goodsSpecificationIdsCriteria = new ArrayList(); + specificationsCriteria = new ArrayList(); } - public List getGoodsSpecificationIdsCriteria() { - return goodsSpecificationIdsCriteria; + public List getSpecificationsCriteria() { + return specificationsCriteria; } - protected void addGoodsSpecificationIdsCriterion(String condition, Object value, String property) { + protected void addSpecificationsCriterion(String condition, Object value, String property) { if (value == null) { throw new RuntimeException("Value for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } - protected void addGoodsSpecificationIdsCriterion(String condition, Integer[] value1, Integer[] value2, String property) { + protected void addSpecificationsCriterion(String condition, String[] value1, String[] value2, String property) { if (value1 == null || value2 == null) { throw new RuntimeException("Between values for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } public boolean isValid() { return criteria.size() > 0 - || goodsSpecificationIdsCriteria.size() > 0; + || specificationsCriteria.size() > 0; } public List getAllCriteria() { if (allCriteria == null) { allCriteria = new ArrayList(); allCriteria.addAll(criteria); - allCriteria.addAll(goodsSpecificationIdsCriteria); + allCriteria.addAll(specificationsCriteria); } return allCriteria; } @@ -511,66 +511,6 @@ public class LitemallCartExample { return (Criteria) this; } - public Criteria andProductIdIsNull() { - addCriterion("product_id is null"); - return (Criteria) this; - } - - public Criteria andProductIdIsNotNull() { - addCriterion("product_id is not null"); - return (Criteria) this; - } - - public Criteria andProductIdEqualTo(Integer value) { - addCriterion("product_id =", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdNotEqualTo(Integer value) { - addCriterion("product_id <>", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdGreaterThan(Integer value) { - addCriterion("product_id >", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdGreaterThanOrEqualTo(Integer value) { - addCriterion("product_id >=", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdLessThan(Integer value) { - addCriterion("product_id <", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdLessThanOrEqualTo(Integer value) { - addCriterion("product_id <=", value, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdIn(List values) { - addCriterion("product_id in", values, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdNotIn(List values) { - addCriterion("product_id not in", values, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdBetween(Integer value1, Integer value2) { - addCriterion("product_id between", value1, value2, "productId"); - return (Criteria) this; - } - - public Criteria andProductIdNotBetween(Integer value1, Integer value2) { - addCriterion("product_id not between", value1, value2, "productId"); - return (Criteria) this; - } - public Criteria andGoodsNameIsNull() { addCriterion("goods_name is null"); return (Criteria) this; @@ -641,63 +581,123 @@ public class LitemallCartExample { return (Criteria) this; } - public Criteria andRetailPriceIsNull() { - addCriterion("retail_price is null"); + public Criteria andProductIdIsNull() { + addCriterion("product_id is null"); return (Criteria) this; } - public Criteria andRetailPriceIsNotNull() { - addCriterion("retail_price is not null"); + public Criteria andProductIdIsNotNull() { + addCriterion("product_id is not null"); return (Criteria) this; } - public Criteria andRetailPriceEqualTo(BigDecimal value) { - addCriterion("retail_price =", value, "retailPrice"); + public Criteria andProductIdEqualTo(Integer value) { + addCriterion("product_id =", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceNotEqualTo(BigDecimal value) { - addCriterion("retail_price <>", value, "retailPrice"); + public Criteria andProductIdNotEqualTo(Integer value) { + addCriterion("product_id <>", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThan(BigDecimal value) { - addCriterion("retail_price >", value, "retailPrice"); + public Criteria andProductIdGreaterThan(Integer value) { + addCriterion("product_id >", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price >=", value, "retailPrice"); + public Criteria andProductIdGreaterThanOrEqualTo(Integer value) { + addCriterion("product_id >=", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceLessThan(BigDecimal value) { - addCriterion("retail_price <", value, "retailPrice"); + public Criteria andProductIdLessThan(Integer value) { + addCriterion("product_id <", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price <=", value, "retailPrice"); + public Criteria andProductIdLessThanOrEqualTo(Integer value) { + addCriterion("product_id <=", value, "productId"); return (Criteria) this; } - public Criteria andRetailPriceIn(List values) { - addCriterion("retail_price in", values, "retailPrice"); + public Criteria andProductIdIn(List values) { + addCriterion("product_id in", values, "productId"); return (Criteria) this; } - public Criteria andRetailPriceNotIn(List values) { - addCriterion("retail_price not in", values, "retailPrice"); + public Criteria andProductIdNotIn(List values) { + addCriterion("product_id not in", values, "productId"); return (Criteria) this; } - public Criteria andRetailPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price between", value1, value2, "retailPrice"); + public Criteria andProductIdBetween(Integer value1, Integer value2) { + addCriterion("product_id between", value1, value2, "productId"); return (Criteria) this; } - public Criteria andRetailPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price not between", value1, value2, "retailPrice"); + public Criteria andProductIdNotBetween(Integer value1, Integer value2) { + addCriterion("product_id not between", value1, value2, "productId"); + return (Criteria) this; + } + + public Criteria andPriceIsNull() { + addCriterion("price is null"); + return (Criteria) this; + } + + public Criteria andPriceIsNotNull() { + addCriterion("price is not null"); + return (Criteria) this; + } + + public Criteria andPriceEqualTo(BigDecimal value) { + addCriterion("price =", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotEqualTo(BigDecimal value) { + addCriterion("price <>", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceGreaterThan(BigDecimal value) { + addCriterion("price >", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price >=", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceLessThan(BigDecimal value) { + addCriterion("price <", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("price <=", value, "price"); + return (Criteria) this; + } + + public Criteria andPriceIn(List values) { + addCriterion("price in", values, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotIn(List values) { + addCriterion("price not in", values, "price"); + return (Criteria) this; + } + + public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price between", value1, value2, "price"); + return (Criteria) this; + } + + public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price not between", value1, value2, "price"); return (Criteria) this; } @@ -761,143 +761,73 @@ public class LitemallCartExample { return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIsNull() { - addCriterion("goods_specification_values is null"); + public Criteria andSpecificationsIsNull() { + addCriterion("specifications is null"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIsNotNull() { - addCriterion("goods_specification_values is not null"); + public Criteria andSpecificationsIsNotNull() { + addCriterion("specifications is not null"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesEqualTo(String value) { - addCriterion("goods_specification_values =", value, "goodsSpecificationValues"); + public Criteria andSpecificationsEqualTo(String[] value) { + addSpecificationsCriterion("specifications =", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotEqualTo(String value) { - addCriterion("goods_specification_values <>", value, "goodsSpecificationValues"); + public Criteria andSpecificationsNotEqualTo(String[] value) { + addSpecificationsCriterion("specifications <>", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesGreaterThan(String value) { - addCriterion("goods_specification_values >", value, "goodsSpecificationValues"); + public Criteria andSpecificationsGreaterThan(String[] value) { + addSpecificationsCriterion("specifications >", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesGreaterThanOrEqualTo(String value) { - addCriterion("goods_specification_values >=", value, "goodsSpecificationValues"); + public Criteria andSpecificationsGreaterThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications >=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLessThan(String value) { - addCriterion("goods_specification_values <", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLessThan(String[] value) { + addSpecificationsCriterion("specifications <", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLessThanOrEqualTo(String value) { - addCriterion("goods_specification_values <=", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLessThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications <=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLike(String value) { - addCriterion("goods_specification_values like", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLike(String[] value) { + addSpecificationsCriterion("specifications like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotLike(String value) { - addCriterion("goods_specification_values not like", value, "goodsSpecificationValues"); + public Criteria andSpecificationsNotLike(String[] value) { + addSpecificationsCriterion("specifications not like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIn(List values) { - addCriterion("goods_specification_values in", values, "goodsSpecificationValues"); + public Criteria andSpecificationsIn(List values) { + addSpecificationsCriterion("specifications in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotIn(List values) { - addCriterion("goods_specification_values not in", values, "goodsSpecificationValues"); + public Criteria andSpecificationsNotIn(List values) { + addSpecificationsCriterion("specifications not in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesBetween(String value1, String value2) { - addCriterion("goods_specification_values between", value1, value2, "goodsSpecificationValues"); + public Criteria andSpecificationsBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications between", value1, value2, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotBetween(String value1, String value2) { - addCriterion("goods_specification_values not between", value1, value2, "goodsSpecificationValues"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIsNull() { - addCriterion("goods_specification_ids is null"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIsNotNull() { - addCriterion("goods_specification_ids is not null"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids =", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <>", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsGreaterThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsGreaterThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >=", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLessThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLessThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <=", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids like", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not like", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids in", values, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not in", values, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids between", value1, value2, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not between", value1, value2, "goodsSpecificationIds"); + public Criteria andSpecificationsNotBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications not between", value1, value2, "specifications"); return (Criteria) this; } @@ -1216,18 +1146,6 @@ public class LitemallCartExample { return deleted ? andDeletedEqualTo(LitemallCart.IS_DELETED) : andDeletedNotEqualTo(LitemallCart.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_cart - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallCart.IS_DELETED) : andDeletedNotEqualTo(LitemallCart.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_cart diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategory.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategory.java index 1711a385..94e311f8 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategory.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategory.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallCategory { /** @@ -12,16 +14,6 @@ public class LitemallCategory { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_category - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_category @@ -31,16 +23,6 @@ public class LitemallCategory { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_category - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -71,56 +53,20 @@ public class LitemallCategory { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.front_desc + * This field corresponds to the database column litemall_category.desc * * @mbg.generated */ - private String frontDesc; + private String desc; /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.parent_id + * This field corresponds to the database column litemall_category.pid * * @mbg.generated */ - private Integer parentId; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.sort_order - * - * @mbg.generated - */ - private Byte sortOrder; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.show_index - * - * @mbg.generated - */ - private Byte showIndex; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.is_show - * - * @mbg.generated - */ - private Boolean isShow; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.banner_url - * - * @mbg.generated - */ - private String bannerUrl; + private Integer pid; /** * @@ -134,20 +80,11 @@ public class LitemallCategory { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.img_url + * This field corresponds to the database column litemall_category.pic_url * * @mbg.generated */ - private String imgUrl; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.wap_banner_url - * - * @mbg.generated - */ - private String wapBannerUrl; + private String picUrl; /** * @@ -161,20 +98,11 @@ public class LitemallCategory { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.type + * This field corresponds to the database column litemall_category.sort_order * * @mbg.generated */ - private Integer type; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_category.front_name - * - * @mbg.generated - */ - private String frontName; + private Byte sortOrder; /** * @@ -268,146 +196,50 @@ public class LitemallCategory { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.front_desc + * This method returns the value of the database column litemall_category.desc * - * @return the value of litemall_category.front_desc + * @return the value of litemall_category.desc * * @mbg.generated */ - public String getFrontDesc() { - return frontDesc; + public String getDesc() { + return desc; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.front_desc + * This method sets the value of the database column litemall_category.desc * - * @param frontDesc the value for litemall_category.front_desc + * @param desc the value for litemall_category.desc * * @mbg.generated */ - public void setFrontDesc(String frontDesc) { - this.frontDesc = frontDesc; + public void setDesc(String desc) { + this.desc = desc; } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.parent_id + * This method returns the value of the database column litemall_category.pid * - * @return the value of litemall_category.parent_id + * @return the value of litemall_category.pid * * @mbg.generated */ - public Integer getParentId() { - return parentId; + public Integer getPid() { + return pid; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.parent_id + * This method sets the value of the database column litemall_category.pid * - * @param parentId the value for litemall_category.parent_id + * @param pid the value for litemall_category.pid * * @mbg.generated */ - public void setParentId(Integer parentId) { - this.parentId = parentId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.sort_order - * - * @return the value of litemall_category.sort_order - * - * @mbg.generated - */ - public Byte getSortOrder() { - return sortOrder; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.sort_order - * - * @param sortOrder the value for litemall_category.sort_order - * - * @mbg.generated - */ - public void setSortOrder(Byte sortOrder) { - this.sortOrder = sortOrder; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.show_index - * - * @return the value of litemall_category.show_index - * - * @mbg.generated - */ - public Byte getShowIndex() { - return showIndex; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.show_index - * - * @param showIndex the value for litemall_category.show_index - * - * @mbg.generated - */ - public void setShowIndex(Byte showIndex) { - this.showIndex = showIndex; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.is_show - * - * @return the value of litemall_category.is_show - * - * @mbg.generated - */ - public Boolean getIsShow() { - return isShow; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.is_show - * - * @param isShow the value for litemall_category.is_show - * - * @mbg.generated - */ - public void setIsShow(Boolean isShow) { - this.isShow = isShow; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.banner_url - * - * @return the value of litemall_category.banner_url - * - * @mbg.generated - */ - public String getBannerUrl() { - return bannerUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.banner_url - * - * @param bannerUrl the value for litemall_category.banner_url - * - * @mbg.generated - */ - public void setBannerUrl(String bannerUrl) { - this.bannerUrl = bannerUrl; + public void setPid(Integer pid) { + this.pid = pid; } /** @@ -436,50 +268,26 @@ public class LitemallCategory { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.img_url + * This method returns the value of the database column litemall_category.pic_url * - * @return the value of litemall_category.img_url + * @return the value of litemall_category.pic_url * * @mbg.generated */ - public String getImgUrl() { - return imgUrl; + public String getPicUrl() { + return picUrl; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.img_url + * This method sets the value of the database column litemall_category.pic_url * - * @param imgUrl the value for litemall_category.img_url + * @param picUrl the value for litemall_category.pic_url * * @mbg.generated */ - public void setImgUrl(String imgUrl) { - this.imgUrl = imgUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.wap_banner_url - * - * @return the value of litemall_category.wap_banner_url - * - * @mbg.generated - */ - public String getWapBannerUrl() { - return wapBannerUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.wap_banner_url - * - * @param wapBannerUrl the value for litemall_category.wap_banner_url - * - * @mbg.generated - */ - public void setWapBannerUrl(String wapBannerUrl) { - this.wapBannerUrl = wapBannerUrl; + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; } /** @@ -508,50 +316,26 @@ public class LitemallCategory { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.type + * This method returns the value of the database column litemall_category.sort_order * - * @return the value of litemall_category.type + * @return the value of litemall_category.sort_order * * @mbg.generated */ - public Integer getType() { - return type; + public Byte getSortOrder() { + return sortOrder; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.type + * This method sets the value of the database column litemall_category.sort_order * - * @param type the value for litemall_category.type + * @param sortOrder the value for litemall_category.sort_order * * @mbg.generated */ - public void setType(Integer type) { - this.type = type; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_category.front_name - * - * @return the value of litemall_category.front_name - * - * @mbg.generated - */ - public String getFrontName() { - return frontName; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_category.front_name - * - * @param frontName the value for litemall_category.front_name - * - * @mbg.generated - */ - public void setFrontName(String frontName) { - this.frontName = frontName; + public void setSortOrder(Byte sortOrder) { + this.sortOrder = sortOrder; } /** @@ -617,18 +401,12 @@ public class LitemallCategory { sb.append(", id=").append(id); sb.append(", name=").append(name); sb.append(", keywords=").append(keywords); - sb.append(", frontDesc=").append(frontDesc); - sb.append(", parentId=").append(parentId); - sb.append(", sortOrder=").append(sortOrder); - sb.append(", showIndex=").append(showIndex); - sb.append(", isShow=").append(isShow); - sb.append(", bannerUrl=").append(bannerUrl); + sb.append(", desc=").append(desc); + sb.append(", pid=").append(pid); sb.append(", iconUrl=").append(iconUrl); - sb.append(", imgUrl=").append(imgUrl); - sb.append(", wapBannerUrl=").append(wapBannerUrl); + sb.append(", picUrl=").append(picUrl); sb.append(", level=").append(level); - sb.append(", type=").append(type); - sb.append(", frontName=").append(frontName); + sb.append(", sortOrder=").append(sortOrder); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append("]"); @@ -656,18 +434,12 @@ public class LitemallCategory { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) && (this.getKeywords() == null ? other.getKeywords() == null : this.getKeywords().equals(other.getKeywords())) - && (this.getFrontDesc() == null ? other.getFrontDesc() == null : this.getFrontDesc().equals(other.getFrontDesc())) - && (this.getParentId() == null ? other.getParentId() == null : this.getParentId().equals(other.getParentId())) - && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) - && (this.getShowIndex() == null ? other.getShowIndex() == null : this.getShowIndex().equals(other.getShowIndex())) - && (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow())) - && (this.getBannerUrl() == null ? other.getBannerUrl() == null : this.getBannerUrl().equals(other.getBannerUrl())) + && (this.getDesc() == null ? other.getDesc() == null : this.getDesc().equals(other.getDesc())) + && (this.getPid() == null ? other.getPid() == null : this.getPid().equals(other.getPid())) && (this.getIconUrl() == null ? other.getIconUrl() == null : this.getIconUrl().equals(other.getIconUrl())) - && (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl())) - && (this.getWapBannerUrl() == null ? other.getWapBannerUrl() == null : this.getWapBannerUrl().equals(other.getWapBannerUrl())) + && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel())) - && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) - && (this.getFrontName() == null ? other.getFrontName() == null : this.getFrontName().equals(other.getFrontName())) + && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); } @@ -685,18 +457,12 @@ public class LitemallCategory { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); result = prime * result + ((getKeywords() == null) ? 0 : getKeywords().hashCode()); - result = prime * result + ((getFrontDesc() == null) ? 0 : getFrontDesc().hashCode()); - result = prime * result + ((getParentId() == null) ? 0 : getParentId().hashCode()); - result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); - result = prime * result + ((getShowIndex() == null) ? 0 : getShowIndex().hashCode()); - result = prime * result + ((getIsShow() == null) ? 0 : getIsShow().hashCode()); - result = prime * result + ((getBannerUrl() == null) ? 0 : getBannerUrl().hashCode()); + result = prime * result + ((getDesc() == null) ? 0 : getDesc().hashCode()); + result = prime * result + ((getPid() == null) ? 0 : getPid().hashCode()); result = prime * result + ((getIconUrl() == null) ? 0 : getIconUrl().hashCode()); - result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode()); - result = prime * result + ((getWapBannerUrl() == null) ? 0 : getWapBannerUrl().hashCode()); + result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getLevel() == null) ? 0 : getLevel().hashCode()); - result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); - result = prime * result + ((getFrontName() == null) ? 0 : getFrontName().hashCode()); + result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); return result; @@ -724,18 +490,12 @@ public class LitemallCategory { id("id", "id", "INTEGER"), name("name", "name", "VARCHAR"), keywords("keywords", "keywords", "VARCHAR"), - frontDesc("front_desc", "frontDesc", "VARCHAR"), - parentId("parent_id", "parentId", "INTEGER"), - sortOrder("sort_order", "sortOrder", "TINYINT"), - showIndex("show_index", "showIndex", "TINYINT"), - isShow("is_show", "isShow", "BIT"), - bannerUrl("banner_url", "bannerUrl", "VARCHAR"), + desc("desc", "desc", "VARCHAR"), + pid("pid", "pid", "INTEGER"), iconUrl("icon_url", "iconUrl", "VARCHAR"), - imgUrl("img_url", "imgUrl", "VARCHAR"), - wapBannerUrl("wap_banner_url", "wapBannerUrl", "VARCHAR"), + picUrl("pic_url", "picUrl", "VARCHAR"), level("level", "level", "VARCHAR"), - type("type", "type", "INTEGER"), - frontName("front_name", "frontName", "VARCHAR"), + sortOrder("sort_order", "sortOrder", "TINYINT"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -844,5 +604,20 @@ public class LitemallCategory { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_category + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategoryExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategoryExample.java index 7a13760a..9ce2e17a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategoryExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCategoryExample.java @@ -426,383 +426,133 @@ public class LitemallCategoryExample { return (Criteria) this; } - public Criteria andFrontDescIsNull() { - addCriterion("front_desc is null"); + public Criteria andDescIsNull() { + addCriterion("`desc` is null"); return (Criteria) this; } - public Criteria andFrontDescIsNotNull() { - addCriterion("front_desc is not null"); + public Criteria andDescIsNotNull() { + addCriterion("`desc` is not null"); return (Criteria) this; } - public Criteria andFrontDescEqualTo(String value) { - addCriterion("front_desc =", value, "frontDesc"); + public Criteria andDescEqualTo(String value) { + addCriterion("`desc` =", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescNotEqualTo(String value) { - addCriterion("front_desc <>", value, "frontDesc"); + public Criteria andDescNotEqualTo(String value) { + addCriterion("`desc` <>", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescGreaterThan(String value) { - addCriterion("front_desc >", value, "frontDesc"); + public Criteria andDescGreaterThan(String value) { + addCriterion("`desc` >", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescGreaterThanOrEqualTo(String value) { - addCriterion("front_desc >=", value, "frontDesc"); + public Criteria andDescGreaterThanOrEqualTo(String value) { + addCriterion("`desc` >=", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescLessThan(String value) { - addCriterion("front_desc <", value, "frontDesc"); + public Criteria andDescLessThan(String value) { + addCriterion("`desc` <", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescLessThanOrEqualTo(String value) { - addCriterion("front_desc <=", value, "frontDesc"); + public Criteria andDescLessThanOrEqualTo(String value) { + addCriterion("`desc` <=", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescLike(String value) { - addCriterion("front_desc like", value, "frontDesc"); + public Criteria andDescLike(String value) { + addCriterion("`desc` like", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescNotLike(String value) { - addCriterion("front_desc not like", value, "frontDesc"); + public Criteria andDescNotLike(String value) { + addCriterion("`desc` not like", value, "desc"); return (Criteria) this; } - public Criteria andFrontDescIn(List values) { - addCriterion("front_desc in", values, "frontDesc"); + public Criteria andDescIn(List values) { + addCriterion("`desc` in", values, "desc"); return (Criteria) this; } - public Criteria andFrontDescNotIn(List values) { - addCriterion("front_desc not in", values, "frontDesc"); + public Criteria andDescNotIn(List values) { + addCriterion("`desc` not in", values, "desc"); return (Criteria) this; } - public Criteria andFrontDescBetween(String value1, String value2) { - addCriterion("front_desc between", value1, value2, "frontDesc"); + public Criteria andDescBetween(String value1, String value2) { + addCriterion("`desc` between", value1, value2, "desc"); return (Criteria) this; } - public Criteria andFrontDescNotBetween(String value1, String value2) { - addCriterion("front_desc not between", value1, value2, "frontDesc"); + public Criteria andDescNotBetween(String value1, String value2) { + addCriterion("`desc` not between", value1, value2, "desc"); return (Criteria) this; } - public Criteria andParentIdIsNull() { - addCriterion("parent_id is null"); + public Criteria andPidIsNull() { + addCriterion("pid is null"); return (Criteria) this; } - public Criteria andParentIdIsNotNull() { - addCriterion("parent_id is not null"); + public Criteria andPidIsNotNull() { + addCriterion("pid is not null"); return (Criteria) this; } - public Criteria andParentIdEqualTo(Integer value) { - addCriterion("parent_id =", value, "parentId"); + public Criteria andPidEqualTo(Integer value) { + addCriterion("pid =", value, "pid"); return (Criteria) this; } - public Criteria andParentIdNotEqualTo(Integer value) { - addCriterion("parent_id <>", value, "parentId"); + public Criteria andPidNotEqualTo(Integer value) { + addCriterion("pid <>", value, "pid"); return (Criteria) this; } - public Criteria andParentIdGreaterThan(Integer value) { - addCriterion("parent_id >", value, "parentId"); + public Criteria andPidGreaterThan(Integer value) { + addCriterion("pid >", value, "pid"); return (Criteria) this; } - public Criteria andParentIdGreaterThanOrEqualTo(Integer value) { - addCriterion("parent_id >=", value, "parentId"); + public Criteria andPidGreaterThanOrEqualTo(Integer value) { + addCriterion("pid >=", value, "pid"); return (Criteria) this; } - public Criteria andParentIdLessThan(Integer value) { - addCriterion("parent_id <", value, "parentId"); + public Criteria andPidLessThan(Integer value) { + addCriterion("pid <", value, "pid"); return (Criteria) this; } - public Criteria andParentIdLessThanOrEqualTo(Integer value) { - addCriterion("parent_id <=", value, "parentId"); + public Criteria andPidLessThanOrEqualTo(Integer value) { + addCriterion("pid <=", value, "pid"); return (Criteria) this; } - public Criteria andParentIdIn(List values) { - addCriterion("parent_id in", values, "parentId"); + public Criteria andPidIn(List values) { + addCriterion("pid in", values, "pid"); return (Criteria) this; } - public Criteria andParentIdNotIn(List values) { - addCriterion("parent_id not in", values, "parentId"); + public Criteria andPidNotIn(List values) { + addCriterion("pid not in", values, "pid"); return (Criteria) this; } - public Criteria andParentIdBetween(Integer value1, Integer value2) { - addCriterion("parent_id between", value1, value2, "parentId"); + public Criteria andPidBetween(Integer value1, Integer value2) { + addCriterion("pid between", value1, value2, "pid"); return (Criteria) this; } - public Criteria andParentIdNotBetween(Integer value1, Integer value2) { - addCriterion("parent_id not between", value1, value2, "parentId"); - return (Criteria) this; - } - - public Criteria andSortOrderIsNull() { - addCriterion("sort_order is null"); - return (Criteria) this; - } - - public Criteria andSortOrderIsNotNull() { - addCriterion("sort_order is not null"); - return (Criteria) this; - } - - public Criteria andSortOrderEqualTo(Byte value) { - addCriterion("sort_order =", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderNotEqualTo(Byte value) { - addCriterion("sort_order <>", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderGreaterThan(Byte value) { - addCriterion("sort_order >", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderGreaterThanOrEqualTo(Byte value) { - addCriterion("sort_order >=", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderLessThan(Byte value) { - addCriterion("sort_order <", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderLessThanOrEqualTo(Byte value) { - addCriterion("sort_order <=", value, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderIn(List values) { - addCriterion("sort_order in", values, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderNotIn(List values) { - addCriterion("sort_order not in", values, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderBetween(Byte value1, Byte value2) { - addCriterion("sort_order between", value1, value2, "sortOrder"); - return (Criteria) this; - } - - public Criteria andSortOrderNotBetween(Byte value1, Byte value2) { - addCriterion("sort_order not between", value1, value2, "sortOrder"); - return (Criteria) this; - } - - public Criteria andShowIndexIsNull() { - addCriterion("show_index is null"); - return (Criteria) this; - } - - public Criteria andShowIndexIsNotNull() { - addCriterion("show_index is not null"); - return (Criteria) this; - } - - public Criteria andShowIndexEqualTo(Byte value) { - addCriterion("show_index =", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexNotEqualTo(Byte value) { - addCriterion("show_index <>", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexGreaterThan(Byte value) { - addCriterion("show_index >", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexGreaterThanOrEqualTo(Byte value) { - addCriterion("show_index >=", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexLessThan(Byte value) { - addCriterion("show_index <", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexLessThanOrEqualTo(Byte value) { - addCriterion("show_index <=", value, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexIn(List values) { - addCriterion("show_index in", values, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexNotIn(List values) { - addCriterion("show_index not in", values, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexBetween(Byte value1, Byte value2) { - addCriterion("show_index between", value1, value2, "showIndex"); - return (Criteria) this; - } - - public Criteria andShowIndexNotBetween(Byte value1, Byte value2) { - addCriterion("show_index not between", value1, value2, "showIndex"); - return (Criteria) this; - } - - public Criteria andIsShowIsNull() { - addCriterion("is_show is null"); - return (Criteria) this; - } - - public Criteria andIsShowIsNotNull() { - addCriterion("is_show is not null"); - return (Criteria) this; - } - - public Criteria andIsShowEqualTo(Boolean value) { - addCriterion("is_show =", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotEqualTo(Boolean value) { - addCriterion("is_show <>", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThan(Boolean value) { - addCriterion("is_show >", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_show >=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThan(Boolean value) { - addCriterion("is_show <", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThanOrEqualTo(Boolean value) { - addCriterion("is_show <=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowIn(List values) { - addCriterion("is_show in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotIn(List values) { - addCriterion("is_show not in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowBetween(Boolean value1, Boolean value2) { - addCriterion("is_show between", value1, value2, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_show not between", value1, value2, "isShow"); - return (Criteria) this; - } - - public Criteria andBannerUrlIsNull() { - addCriterion("banner_url is null"); - return (Criteria) this; - } - - public Criteria andBannerUrlIsNotNull() { - addCriterion("banner_url is not null"); - return (Criteria) this; - } - - public Criteria andBannerUrlEqualTo(String value) { - addCriterion("banner_url =", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlNotEqualTo(String value) { - addCriterion("banner_url <>", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlGreaterThan(String value) { - addCriterion("banner_url >", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlGreaterThanOrEqualTo(String value) { - addCriterion("banner_url >=", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlLessThan(String value) { - addCriterion("banner_url <", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlLessThanOrEqualTo(String value) { - addCriterion("banner_url <=", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlLike(String value) { - addCriterion("banner_url like", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlNotLike(String value) { - addCriterion("banner_url not like", value, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlIn(List values) { - addCriterion("banner_url in", values, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlNotIn(List values) { - addCriterion("banner_url not in", values, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlBetween(String value1, String value2) { - addCriterion("banner_url between", value1, value2, "bannerUrl"); - return (Criteria) this; - } - - public Criteria andBannerUrlNotBetween(String value1, String value2) { - addCriterion("banner_url not between", value1, value2, "bannerUrl"); + public Criteria andPidNotBetween(Integer value1, Integer value2) { + addCriterion("pid not between", value1, value2, "pid"); return (Criteria) this; } @@ -876,143 +626,73 @@ public class LitemallCategoryExample { return (Criteria) this; } - public Criteria andImgUrlIsNull() { - addCriterion("img_url is null"); + public Criteria andPicUrlIsNull() { + addCriterion("pic_url is null"); return (Criteria) this; } - public Criteria andImgUrlIsNotNull() { - addCriterion("img_url is not null"); + public Criteria andPicUrlIsNotNull() { + addCriterion("pic_url is not null"); return (Criteria) this; } - public Criteria andImgUrlEqualTo(String value) { - addCriterion("img_url =", value, "imgUrl"); + public Criteria andPicUrlEqualTo(String value) { + addCriterion("pic_url =", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlNotEqualTo(String value) { - addCriterion("img_url <>", value, "imgUrl"); + public Criteria andPicUrlNotEqualTo(String value) { + addCriterion("pic_url <>", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlGreaterThan(String value) { - addCriterion("img_url >", value, "imgUrl"); + public Criteria andPicUrlGreaterThan(String value) { + addCriterion("pic_url >", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlGreaterThanOrEqualTo(String value) { - addCriterion("img_url >=", value, "imgUrl"); + public Criteria andPicUrlGreaterThanOrEqualTo(String value) { + addCriterion("pic_url >=", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlLessThan(String value) { - addCriterion("img_url <", value, "imgUrl"); + public Criteria andPicUrlLessThan(String value) { + addCriterion("pic_url <", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlLessThanOrEqualTo(String value) { - addCriterion("img_url <=", value, "imgUrl"); + public Criteria andPicUrlLessThanOrEqualTo(String value) { + addCriterion("pic_url <=", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlLike(String value) { - addCriterion("img_url like", value, "imgUrl"); + public Criteria andPicUrlLike(String value) { + addCriterion("pic_url like", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlNotLike(String value) { - addCriterion("img_url not like", value, "imgUrl"); + public Criteria andPicUrlNotLike(String value) { + addCriterion("pic_url not like", value, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlIn(List values) { - addCriterion("img_url in", values, "imgUrl"); + public Criteria andPicUrlIn(List values) { + addCriterion("pic_url in", values, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlNotIn(List values) { - addCriterion("img_url not in", values, "imgUrl"); + public Criteria andPicUrlNotIn(List values) { + addCriterion("pic_url not in", values, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlBetween(String value1, String value2) { - addCriterion("img_url between", value1, value2, "imgUrl"); + public Criteria andPicUrlBetween(String value1, String value2) { + addCriterion("pic_url between", value1, value2, "picUrl"); return (Criteria) this; } - public Criteria andImgUrlNotBetween(String value1, String value2) { - addCriterion("img_url not between", value1, value2, "imgUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlIsNull() { - addCriterion("wap_banner_url is null"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlIsNotNull() { - addCriterion("wap_banner_url is not null"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlEqualTo(String value) { - addCriterion("wap_banner_url =", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlNotEqualTo(String value) { - addCriterion("wap_banner_url <>", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlGreaterThan(String value) { - addCriterion("wap_banner_url >", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlGreaterThanOrEqualTo(String value) { - addCriterion("wap_banner_url >=", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlLessThan(String value) { - addCriterion("wap_banner_url <", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlLessThanOrEqualTo(String value) { - addCriterion("wap_banner_url <=", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlLike(String value) { - addCriterion("wap_banner_url like", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlNotLike(String value) { - addCriterion("wap_banner_url not like", value, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlIn(List values) { - addCriterion("wap_banner_url in", values, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlNotIn(List values) { - addCriterion("wap_banner_url not in", values, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlBetween(String value1, String value2) { - addCriterion("wap_banner_url between", value1, value2, "wapBannerUrl"); - return (Criteria) this; - } - - public Criteria andWapBannerUrlNotBetween(String value1, String value2) { - addCriterion("wap_banner_url not between", value1, value2, "wapBannerUrl"); + public Criteria andPicUrlNotBetween(String value1, String value2) { + addCriterion("pic_url not between", value1, value2, "picUrl"); return (Criteria) this; } @@ -1086,133 +766,63 @@ public class LitemallCategoryExample { return (Criteria) this; } - public Criteria andTypeIsNull() { - addCriterion("`type` is null"); + public Criteria andSortOrderIsNull() { + addCriterion("sort_order is null"); return (Criteria) this; } - public Criteria andTypeIsNotNull() { - addCriterion("`type` is not null"); + public Criteria andSortOrderIsNotNull() { + addCriterion("sort_order is not null"); return (Criteria) this; } - public Criteria andTypeEqualTo(Integer value) { - addCriterion("`type` =", value, "type"); + public Criteria andSortOrderEqualTo(Byte value) { + addCriterion("sort_order =", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeNotEqualTo(Integer value) { - addCriterion("`type` <>", value, "type"); + public Criteria andSortOrderNotEqualTo(Byte value) { + addCriterion("sort_order <>", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeGreaterThan(Integer value) { - addCriterion("`type` >", value, "type"); + public Criteria andSortOrderGreaterThan(Byte value) { + addCriterion("sort_order >", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeGreaterThanOrEqualTo(Integer value) { - addCriterion("`type` >=", value, "type"); + public Criteria andSortOrderGreaterThanOrEqualTo(Byte value) { + addCriterion("sort_order >=", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeLessThan(Integer value) { - addCriterion("`type` <", value, "type"); + public Criteria andSortOrderLessThan(Byte value) { + addCriterion("sort_order <", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeLessThanOrEqualTo(Integer value) { - addCriterion("`type` <=", value, "type"); + public Criteria andSortOrderLessThanOrEqualTo(Byte value) { + addCriterion("sort_order <=", value, "sortOrder"); return (Criteria) this; } - public Criteria andTypeIn(List values) { - addCriterion("`type` in", values, "type"); + public Criteria andSortOrderIn(List values) { + addCriterion("sort_order in", values, "sortOrder"); return (Criteria) this; } - public Criteria andTypeNotIn(List values) { - addCriterion("`type` not in", values, "type"); + public Criteria andSortOrderNotIn(List values) { + addCriterion("sort_order not in", values, "sortOrder"); return (Criteria) this; } - public Criteria andTypeBetween(Integer value1, Integer value2) { - addCriterion("`type` between", value1, value2, "type"); + public Criteria andSortOrderBetween(Byte value1, Byte value2) { + addCriterion("sort_order between", value1, value2, "sortOrder"); return (Criteria) this; } - public Criteria andTypeNotBetween(Integer value1, Integer value2) { - addCriterion("`type` not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andFrontNameIsNull() { - addCriterion("front_name is null"); - return (Criteria) this; - } - - public Criteria andFrontNameIsNotNull() { - addCriterion("front_name is not null"); - return (Criteria) this; - } - - public Criteria andFrontNameEqualTo(String value) { - addCriterion("front_name =", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameNotEqualTo(String value) { - addCriterion("front_name <>", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameGreaterThan(String value) { - addCriterion("front_name >", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameGreaterThanOrEqualTo(String value) { - addCriterion("front_name >=", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameLessThan(String value) { - addCriterion("front_name <", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameLessThanOrEqualTo(String value) { - addCriterion("front_name <=", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameLike(String value) { - addCriterion("front_name like", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameNotLike(String value) { - addCriterion("front_name not like", value, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameIn(List values) { - addCriterion("front_name in", values, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameNotIn(List values) { - addCriterion("front_name not in", values, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameBetween(String value1, String value2) { - addCriterion("front_name between", value1, value2, "frontName"); - return (Criteria) this; - } - - public Criteria andFrontNameNotBetween(String value1, String value2) { - addCriterion("front_name not between", value1, value2, "frontName"); + public Criteria andSortOrderNotBetween(Byte value1, Byte value2) { + addCriterion("sort_order not between", value1, value2, "sortOrder"); return (Criteria) this; } @@ -1401,18 +1011,6 @@ public class LitemallCategoryExample { return deleted ? andDeletedEqualTo(LitemallCategory.IS_DELETED) : andDeletedNotEqualTo(LitemallCategory.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_category - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallCategory.IS_DELETED) : andDeletedNotEqualTo(LitemallCategory.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_category diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollect.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollect.java index 6349e375..4f8cdd7e 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollect.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollect.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallCollect { /** @@ -12,16 +14,6 @@ public class LitemallCollect { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_collect - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_collect @@ -31,16 +23,6 @@ public class LitemallCollect { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_collect - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -71,20 +53,11 @@ public class LitemallCollect { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_collect.is_attention + * This field corresponds to the database column litemall_collect.type * * @mbg.generated */ - private Boolean isAttention; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_collect.type_id - * - * @mbg.generated - */ - private Integer typeId; + private Byte type; /** * @@ -178,50 +151,26 @@ public class LitemallCollect { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_collect.is_attention + * This method returns the value of the database column litemall_collect.type * - * @return the value of litemall_collect.is_attention + * @return the value of litemall_collect.type * * @mbg.generated */ - public Boolean getIsAttention() { - return isAttention; + public Byte getType() { + return type; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_collect.is_attention + * This method sets the value of the database column litemall_collect.type * - * @param isAttention the value for litemall_collect.is_attention + * @param type the value for litemall_collect.type * * @mbg.generated */ - public void setIsAttention(Boolean isAttention) { - this.isAttention = isAttention; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_collect.type_id - * - * @return the value of litemall_collect.type_id - * - * @mbg.generated - */ - public Integer getTypeId() { - return typeId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_collect.type_id - * - * @param typeId the value for litemall_collect.type_id - * - * @mbg.generated - */ - public void setTypeId(Integer typeId) { - this.typeId = typeId; + public void setType(Byte type) { + this.type = type; } /** @@ -287,8 +236,7 @@ public class LitemallCollect { sb.append(", id=").append(id); sb.append(", userId=").append(userId); sb.append(", valueId=").append(valueId); - sb.append(", isAttention=").append(isAttention); - sb.append(", typeId=").append(typeId); + sb.append(", type=").append(type); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append("]"); @@ -316,8 +264,7 @@ public class LitemallCollect { return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getValueId() == null ? other.getValueId() == null : this.getValueId().equals(other.getValueId())) - && (this.getIsAttention() == null ? other.getIsAttention() == null : this.getIsAttention().equals(other.getIsAttention())) - && (this.getTypeId() == null ? other.getTypeId() == null : this.getTypeId().equals(other.getTypeId())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); } @@ -335,8 +282,7 @@ public class LitemallCollect { result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getValueId() == null) ? 0 : getValueId().hashCode()); - result = prime * result + ((getIsAttention() == null) ? 0 : getIsAttention().hashCode()); - result = prime * result + ((getTypeId() == null) ? 0 : getTypeId().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); return result; @@ -364,8 +310,7 @@ public class LitemallCollect { id("id", "id", "INTEGER"), userId("user_id", "userId", "INTEGER"), valueId("value_id", "valueId", "INTEGER"), - isAttention("is_attention", "isAttention", "BIT"), - typeId("type_id", "typeId", "INTEGER"), + type("type", "type", "TINYINT"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -474,5 +419,20 @@ public class LitemallCollect { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_collect + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollectExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollectExample.java index 0542c4ec..6a2f6992 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollectExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCollectExample.java @@ -406,123 +406,63 @@ public class LitemallCollectExample { return (Criteria) this; } - public Criteria andIsAttentionIsNull() { - addCriterion("is_attention is null"); + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); return (Criteria) this; } - public Criteria andIsAttentionIsNotNull() { - addCriterion("is_attention is not null"); + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); return (Criteria) this; } - public Criteria andIsAttentionEqualTo(Boolean value) { - addCriterion("is_attention =", value, "isAttention"); + public Criteria andTypeEqualTo(Byte value) { + addCriterion("`type` =", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionNotEqualTo(Boolean value) { - addCriterion("is_attention <>", value, "isAttention"); + public Criteria andTypeNotEqualTo(Byte value) { + addCriterion("`type` <>", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionGreaterThan(Boolean value) { - addCriterion("is_attention >", value, "isAttention"); + public Criteria andTypeGreaterThan(Byte value) { + addCriterion("`type` >", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_attention >=", value, "isAttention"); + public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("`type` >=", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionLessThan(Boolean value) { - addCriterion("is_attention <", value, "isAttention"); + public Criteria andTypeLessThan(Byte value) { + addCriterion("`type` <", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionLessThanOrEqualTo(Boolean value) { - addCriterion("is_attention <=", value, "isAttention"); + public Criteria andTypeLessThanOrEqualTo(Byte value) { + addCriterion("`type` <=", value, "type"); return (Criteria) this; } - public Criteria andIsAttentionIn(List values) { - addCriterion("is_attention in", values, "isAttention"); + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); return (Criteria) this; } - public Criteria andIsAttentionNotIn(List values) { - addCriterion("is_attention not in", values, "isAttention"); + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); return (Criteria) this; } - public Criteria andIsAttentionBetween(Boolean value1, Boolean value2) { - addCriterion("is_attention between", value1, value2, "isAttention"); + public Criteria andTypeBetween(Byte value1, Byte value2) { + addCriterion("`type` between", value1, value2, "type"); return (Criteria) this; } - public Criteria andIsAttentionNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_attention not between", value1, value2, "isAttention"); - return (Criteria) this; - } - - public Criteria andTypeIdIsNull() { - addCriterion("type_id is null"); - return (Criteria) this; - } - - public Criteria andTypeIdIsNotNull() { - addCriterion("type_id is not null"); - return (Criteria) this; - } - - public Criteria andTypeIdEqualTo(Integer value) { - addCriterion("type_id =", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotEqualTo(Integer value) { - addCriterion("type_id <>", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdGreaterThan(Integer value) { - addCriterion("type_id >", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdGreaterThanOrEqualTo(Integer value) { - addCriterion("type_id >=", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdLessThan(Integer value) { - addCriterion("type_id <", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdLessThanOrEqualTo(Integer value) { - addCriterion("type_id <=", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdIn(List values) { - addCriterion("type_id in", values, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotIn(List values) { - addCriterion("type_id not in", values, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdBetween(Integer value1, Integer value2) { - addCriterion("type_id between", value1, value2, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotBetween(Integer value1, Integer value2) { - addCriterion("type_id not between", value1, value2, "typeId"); + public Criteria andTypeNotBetween(Byte value1, Byte value2) { + addCriterion("`type` not between", value1, value2, "type"); return (Criteria) this; } @@ -711,18 +651,6 @@ public class LitemallCollectExample { return deleted ? andDeletedEqualTo(LitemallCollect.IS_DELETED) : andDeletedNotEqualTo(LitemallCollect.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_collect - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallCollect.IS_DELETED) : andDeletedNotEqualTo(LitemallCollect.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_collect diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallComment.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallComment.java index 78518135..2ed71bf9 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallComment.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallComment.java @@ -1,6 +1,7 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; public class LitemallComment { @@ -13,16 +14,6 @@ public class LitemallComment { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_comment - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_comment @@ -32,16 +23,6 @@ public class LitemallComment { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_comment - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -51,15 +32,6 @@ public class LitemallComment { */ private Integer id; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_comment.type_id - * - * @mbg.generated - */ - private Byte typeId; - /** * * This field was generated by MyBatis Generator. @@ -69,6 +41,15 @@ public class LitemallComment { */ private Integer valueId; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_comment.type + * + * @mbg.generated + */ + private Byte type; + /** * * This field was generated by MyBatis Generator. @@ -156,30 +137,6 @@ public class LitemallComment { this.id = id; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_comment.type_id - * - * @return the value of litemall_comment.type_id - * - * @mbg.generated - */ - public Byte getTypeId() { - return typeId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_comment.type_id - * - * @param typeId the value for litemall_comment.type_id - * - * @mbg.generated - */ - public void setTypeId(Byte typeId) { - this.typeId = typeId; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_comment.value_id @@ -204,6 +161,30 @@ public class LitemallComment { this.valueId = valueId; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_comment.type + * + * @return the value of litemall_comment.type + * + * @mbg.generated + */ + public Byte getType() { + return type; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_comment.type + * + * @param type the value for litemall_comment.type + * + * @mbg.generated + */ + public void setType(Byte type) { + this.type = type; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_comment.content @@ -385,8 +366,8 @@ public class LitemallComment { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); - sb.append(", typeId=").append(typeId); sb.append(", valueId=").append(valueId); + sb.append(", type=").append(type); sb.append(", content=").append(content); sb.append(", userId=").append(userId); sb.append(", hasPicture=").append(hasPicture); @@ -417,8 +398,8 @@ public class LitemallComment { } LitemallComment other = (LitemallComment) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getTypeId() == null ? other.getTypeId() == null : this.getTypeId().equals(other.getTypeId())) && (this.getValueId() == null ? other.getValueId() == null : this.getValueId().equals(other.getValueId())) + && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())) && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) && (this.getHasPicture() == null ? other.getHasPicture() == null : this.getHasPicture().equals(other.getHasPicture())) @@ -439,8 +420,8 @@ public class LitemallComment { final int prime = 31; int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getTypeId() == null) ? 0 : getTypeId().hashCode()); result = prime * result + ((getValueId() == null) ? 0 : getValueId().hashCode()); + result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); result = prime * result + ((getHasPicture() == null) ? 0 : getHasPicture().hashCode()); @@ -471,12 +452,12 @@ public class LitemallComment { */ public enum Column { id("id", "id", "INTEGER"), - typeId("type_id", "typeId", "TINYINT"), valueId("value_id", "valueId", "INTEGER"), + type("type", "type", "TINYINT"), content("content", "content", "VARCHAR"), userId("user_id", "userId", "INTEGER"), hasPicture("has_picture", "hasPicture", "BIT"), - picUrls("pic_urls", "picUrls", "CHAR"), + picUrls("pic_urls", "picUrls", "VARCHAR"), star("star", "star", "SMALLINT"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -586,5 +567,20 @@ public class LitemallComment { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_comment + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java index 7852e70d..8b4c28a7 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCommentExample.java @@ -320,66 +320,6 @@ public class LitemallCommentExample { return (Criteria) this; } - public Criteria andTypeIdIsNull() { - addCriterion("type_id is null"); - return (Criteria) this; - } - - public Criteria andTypeIdIsNotNull() { - addCriterion("type_id is not null"); - return (Criteria) this; - } - - public Criteria andTypeIdEqualTo(Byte value) { - addCriterion("type_id =", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotEqualTo(Byte value) { - addCriterion("type_id <>", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdGreaterThan(Byte value) { - addCriterion("type_id >", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdGreaterThanOrEqualTo(Byte value) { - addCriterion("type_id >=", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdLessThan(Byte value) { - addCriterion("type_id <", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdLessThanOrEqualTo(Byte value) { - addCriterion("type_id <=", value, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdIn(List values) { - addCriterion("type_id in", values, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotIn(List values) { - addCriterion("type_id not in", values, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdBetween(Byte value1, Byte value2) { - addCriterion("type_id between", value1, value2, "typeId"); - return (Criteria) this; - } - - public Criteria andTypeIdNotBetween(Byte value1, Byte value2) { - addCriterion("type_id not between", value1, value2, "typeId"); - return (Criteria) this; - } - public Criteria andValueIdIsNull() { addCriterion("value_id is null"); return (Criteria) this; @@ -440,6 +380,66 @@ public class LitemallCommentExample { return (Criteria) this; } + public Criteria andTypeIsNull() { + addCriterion("`type` is null"); + return (Criteria) this; + } + + public Criteria andTypeIsNotNull() { + addCriterion("`type` is not null"); + return (Criteria) this; + } + + public Criteria andTypeEqualTo(Byte value) { + addCriterion("`type` =", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotEqualTo(Byte value) { + addCriterion("`type` <>", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThan(Byte value) { + addCriterion("`type` >", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeGreaterThanOrEqualTo(Byte value) { + addCriterion("`type` >=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThan(Byte value) { + addCriterion("`type` <", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeLessThanOrEqualTo(Byte value) { + addCriterion("`type` <=", value, "type"); + return (Criteria) this; + } + + public Criteria andTypeIn(List values) { + addCriterion("`type` in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotIn(List values) { + addCriterion("`type` not in", values, "type"); + return (Criteria) this; + } + + public Criteria andTypeBetween(Byte value1, Byte value2) { + addCriterion("`type` between", value1, value2, "type"); + return (Criteria) this; + } + + public Criteria andTypeNotBetween(Byte value1, Byte value2) { + addCriterion("`type` not between", value1, value2, "type"); + return (Criteria) this; + } + public Criteria andContentIsNull() { addCriterion("content is null"); return (Criteria) this; @@ -945,18 +945,6 @@ public class LitemallCommentExample { return deleted ? andDeletedEqualTo(LitemallComment.IS_DELETED) : andDeletedNotEqualTo(LitemallComment.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_comment - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallComment.IS_DELETED) : andDeletedNotEqualTo(LitemallComment.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_comment diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCoupon.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCoupon.java deleted file mode 100644 index ecfb0abe..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCoupon.java +++ /dev/null @@ -1,701 +0,0 @@ -package org.linlinjava.litemall.db.domain; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -public class LitemallCoupon { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public static final Boolean NOT_DELETED = false; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public static final Boolean IS_DELETED = true; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.id - * - * @mbg.generated - */ - private Integer id; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.name - * - * @mbg.generated - */ - private String name; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.type_money - * - * @mbg.generated - */ - private BigDecimal typeMoney; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.send_type - * - * @mbg.generated - */ - private Byte sendType; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.min_amount - * - * @mbg.generated - */ - private BigDecimal minAmount; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.max_amount - * - * @mbg.generated - */ - private BigDecimal maxAmount; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.min_goods_amount - * - * @mbg.generated - */ - private BigDecimal minGoodsAmount; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.send_start - * - * @mbg.generated - */ - private LocalDateTime sendStart; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.send_end - * - * @mbg.generated - */ - private LocalDateTime sendEnd; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.use_start - * - * @mbg.generated - */ - private LocalDateTime useStart; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.use_end - * - * @mbg.generated - */ - private LocalDateTime useEnd; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.add_time - * - * @mbg.generated - */ - private LocalDateTime addTime; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_coupon.deleted - * - * @mbg.generated - */ - private Boolean deleted; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.id - * - * @return the value of litemall_coupon.id - * - * @mbg.generated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.id - * - * @param id the value for litemall_coupon.id - * - * @mbg.generated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.name - * - * @return the value of litemall_coupon.name - * - * @mbg.generated - */ - public String getName() { - return name; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.name - * - * @param name the value for litemall_coupon.name - * - * @mbg.generated - */ - public void setName(String name) { - this.name = name; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.type_money - * - * @return the value of litemall_coupon.type_money - * - * @mbg.generated - */ - public BigDecimal getTypeMoney() { - return typeMoney; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.type_money - * - * @param typeMoney the value for litemall_coupon.type_money - * - * @mbg.generated - */ - public void setTypeMoney(BigDecimal typeMoney) { - this.typeMoney = typeMoney; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.send_type - * - * @return the value of litemall_coupon.send_type - * - * @mbg.generated - */ - public Byte getSendType() { - return sendType; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.send_type - * - * @param sendType the value for litemall_coupon.send_type - * - * @mbg.generated - */ - public void setSendType(Byte sendType) { - this.sendType = sendType; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.min_amount - * - * @return the value of litemall_coupon.min_amount - * - * @mbg.generated - */ - public BigDecimal getMinAmount() { - return minAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.min_amount - * - * @param minAmount the value for litemall_coupon.min_amount - * - * @mbg.generated - */ - public void setMinAmount(BigDecimal minAmount) { - this.minAmount = minAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.max_amount - * - * @return the value of litemall_coupon.max_amount - * - * @mbg.generated - */ - public BigDecimal getMaxAmount() { - return maxAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.max_amount - * - * @param maxAmount the value for litemall_coupon.max_amount - * - * @mbg.generated - */ - public void setMaxAmount(BigDecimal maxAmount) { - this.maxAmount = maxAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.min_goods_amount - * - * @return the value of litemall_coupon.min_goods_amount - * - * @mbg.generated - */ - public BigDecimal getMinGoodsAmount() { - return minGoodsAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.min_goods_amount - * - * @param minGoodsAmount the value for litemall_coupon.min_goods_amount - * - * @mbg.generated - */ - public void setMinGoodsAmount(BigDecimal minGoodsAmount) { - this.minGoodsAmount = minGoodsAmount; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.send_start - * - * @return the value of litemall_coupon.send_start - * - * @mbg.generated - */ - public LocalDateTime getSendStart() { - return sendStart; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.send_start - * - * @param sendStart the value for litemall_coupon.send_start - * - * @mbg.generated - */ - public void setSendStart(LocalDateTime sendStart) { - this.sendStart = sendStart; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.send_end - * - * @return the value of litemall_coupon.send_end - * - * @mbg.generated - */ - public LocalDateTime getSendEnd() { - return sendEnd; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.send_end - * - * @param sendEnd the value for litemall_coupon.send_end - * - * @mbg.generated - */ - public void setSendEnd(LocalDateTime sendEnd) { - this.sendEnd = sendEnd; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.use_start - * - * @return the value of litemall_coupon.use_start - * - * @mbg.generated - */ - public LocalDateTime getUseStart() { - return useStart; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.use_start - * - * @param useStart the value for litemall_coupon.use_start - * - * @mbg.generated - */ - public void setUseStart(LocalDateTime useStart) { - this.useStart = useStart; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.use_end - * - * @return the value of litemall_coupon.use_end - * - * @mbg.generated - */ - public LocalDateTime getUseEnd() { - return useEnd; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.use_end - * - * @param useEnd the value for litemall_coupon.use_end - * - * @mbg.generated - */ - public void setUseEnd(LocalDateTime useEnd) { - this.useEnd = useEnd; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.add_time - * - * @return the value of litemall_coupon.add_time - * - * @mbg.generated - */ - public LocalDateTime getAddTime() { - return addTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.add_time - * - * @param addTime the value for litemall_coupon.add_time - * - * @mbg.generated - */ - public void setAddTime(LocalDateTime addTime) { - this.addTime = addTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_coupon.deleted - * - * @return the value of litemall_coupon.deleted - * - * @mbg.generated - */ - public Boolean getDeleted() { - return deleted; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_coupon.deleted - * - * @param deleted the value for litemall_coupon.deleted - * - * @mbg.generated - */ - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", name=").append(name); - sb.append(", typeMoney=").append(typeMoney); - sb.append(", sendType=").append(sendType); - sb.append(", minAmount=").append(minAmount); - sb.append(", maxAmount=").append(maxAmount); - sb.append(", minGoodsAmount=").append(minGoodsAmount); - sb.append(", sendStart=").append(sendStart); - sb.append(", sendEnd=").append(sendEnd); - sb.append(", useStart=").append(useStart); - sb.append(", useEnd=").append(useEnd); - sb.append(", addTime=").append(addTime); - sb.append(", deleted=").append(deleted); - sb.append("]"); - return sb.toString(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - LitemallCoupon other = (LitemallCoupon) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName())) - && (this.getTypeMoney() == null ? other.getTypeMoney() == null : this.getTypeMoney().equals(other.getTypeMoney())) - && (this.getSendType() == null ? other.getSendType() == null : this.getSendType().equals(other.getSendType())) - && (this.getMinAmount() == null ? other.getMinAmount() == null : this.getMinAmount().equals(other.getMinAmount())) - && (this.getMaxAmount() == null ? other.getMaxAmount() == null : this.getMaxAmount().equals(other.getMaxAmount())) - && (this.getMinGoodsAmount() == null ? other.getMinGoodsAmount() == null : this.getMinGoodsAmount().equals(other.getMinGoodsAmount())) - && (this.getSendStart() == null ? other.getSendStart() == null : this.getSendStart().equals(other.getSendStart())) - && (this.getSendEnd() == null ? other.getSendEnd() == null : this.getSendEnd().equals(other.getSendEnd())) - && (this.getUseStart() == null ? other.getUseStart() == null : this.getUseStart().equals(other.getUseStart())) - && (this.getUseEnd() == null ? other.getUseEnd() == null : this.getUseEnd().equals(other.getUseEnd())) - && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) - && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getName() == null) ? 0 : getName().hashCode()); - result = prime * result + ((getTypeMoney() == null) ? 0 : getTypeMoney().hashCode()); - result = prime * result + ((getSendType() == null) ? 0 : getSendType().hashCode()); - result = prime * result + ((getMinAmount() == null) ? 0 : getMinAmount().hashCode()); - result = prime * result + ((getMaxAmount() == null) ? 0 : getMaxAmount().hashCode()); - result = prime * result + ((getMinGoodsAmount() == null) ? 0 : getMinGoodsAmount().hashCode()); - result = prime * result + ((getSendStart() == null) ? 0 : getSendStart().hashCode()); - result = prime * result + ((getSendEnd() == null) ? 0 : getSendEnd().hashCode()); - result = prime * result + ((getUseStart() == null) ? 0 : getUseStart().hashCode()); - result = prime * result + ((getUseEnd() == null) ? 0 : getUseEnd().hashCode()); - result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); - result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); - return result; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public void andLogicalDeleted(boolean deleted) { - setDeleted(deleted ? IS_DELETED : NOT_DELETED); - } - - /** - * This enum was generated by MyBatis Generator. - * This enum corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public enum Column { - id("id", "id", "INTEGER"), - name("name", "name", "VARCHAR"), - typeMoney("type_money", "typeMoney", "DECIMAL"), - sendType("send_type", "sendType", "TINYINT"), - minAmount("min_amount", "minAmount", "DECIMAL"), - maxAmount("max_amount", "maxAmount", "DECIMAL"), - minGoodsAmount("min_goods_amount", "minGoodsAmount", "DECIMAL"), - sendStart("send_start", "sendStart", "TIMESTAMP"), - sendEnd("send_end", "sendEnd", "TIMESTAMP"), - useStart("use_start", "useStart", "TIMESTAMP"), - useEnd("use_end", "useEnd", "TIMESTAMP"), - addTime("add_time", "addTime", "TIMESTAMP"), - deleted("deleted", "deleted", "BIT"); - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String column; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String javaProperty; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String jdbcType; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String value() { - return this.column; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getValue() { - return this.column; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getJavaProperty() { - return this.javaProperty; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getJdbcType() { - return this.jdbcType; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - Column(String column, String javaProperty, String jdbcType) { - this.column = column; - this.javaProperty = javaProperty; - this.jdbcType = jdbcType; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String desc() { - return this.column + " DESC"; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String asc() { - return this.column + " ASC"; - } - } -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCouponExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCouponExample.java deleted file mode 100644 index 3290878b..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallCouponExample.java +++ /dev/null @@ -1,1207 +0,0 @@ -package org.linlinjava.litemall.db.domain; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class LitemallCouponExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - protected String orderByClause; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - protected boolean distinct; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - protected List oredCriteria; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public LitemallCouponExample() { - oredCriteria = new ArrayList(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallCouponExample orderBy(String orderByClause) { - this.setOrderByClause(orderByClause); - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallCouponExample orderBy(String ... orderByClauses) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < orderByClauses.length; i++) { - sb.append(orderByClauses[i]); - if (i < orderByClauses.length - 1) { - sb.append(" , "); - } - } - this.setOrderByClause(sb.toString()); - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(this); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andNameIsNull() { - addCriterion("`name` is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("`name` is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("`name` =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("`name` <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("`name` >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("`name` >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("`name` <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("`name` <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("`name` like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("`name` not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("`name` in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("`name` not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("`name` between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("`name` not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andTypeMoneyIsNull() { - addCriterion("type_money is null"); - return (Criteria) this; - } - - public Criteria andTypeMoneyIsNotNull() { - addCriterion("type_money is not null"); - return (Criteria) this; - } - - public Criteria andTypeMoneyEqualTo(BigDecimal value) { - addCriterion("type_money =", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyNotEqualTo(BigDecimal value) { - addCriterion("type_money <>", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyGreaterThan(BigDecimal value) { - addCriterion("type_money >", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("type_money >=", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyLessThan(BigDecimal value) { - addCriterion("type_money <", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyLessThanOrEqualTo(BigDecimal value) { - addCriterion("type_money <=", value, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyIn(List values) { - addCriterion("type_money in", values, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyNotIn(List values) { - addCriterion("type_money not in", values, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("type_money between", value1, value2, "typeMoney"); - return (Criteria) this; - } - - public Criteria andTypeMoneyNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("type_money not between", value1, value2, "typeMoney"); - return (Criteria) this; - } - - public Criteria andSendTypeIsNull() { - addCriterion("send_type is null"); - return (Criteria) this; - } - - public Criteria andSendTypeIsNotNull() { - addCriterion("send_type is not null"); - return (Criteria) this; - } - - public Criteria andSendTypeEqualTo(Byte value) { - addCriterion("send_type =", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeNotEqualTo(Byte value) { - addCriterion("send_type <>", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeGreaterThan(Byte value) { - addCriterion("send_type >", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("send_type >=", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeLessThan(Byte value) { - addCriterion("send_type <", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeLessThanOrEqualTo(Byte value) { - addCriterion("send_type <=", value, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeIn(List values) { - addCriterion("send_type in", values, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeNotIn(List values) { - addCriterion("send_type not in", values, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeBetween(Byte value1, Byte value2) { - addCriterion("send_type between", value1, value2, "sendType"); - return (Criteria) this; - } - - public Criteria andSendTypeNotBetween(Byte value1, Byte value2) { - addCriterion("send_type not between", value1, value2, "sendType"); - return (Criteria) this; - } - - public Criteria andMinAmountIsNull() { - addCriterion("min_amount is null"); - return (Criteria) this; - } - - public Criteria andMinAmountIsNotNull() { - addCriterion("min_amount is not null"); - return (Criteria) this; - } - - public Criteria andMinAmountEqualTo(BigDecimal value) { - addCriterion("min_amount =", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountNotEqualTo(BigDecimal value) { - addCriterion("min_amount <>", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountGreaterThan(BigDecimal value) { - addCriterion("min_amount >", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("min_amount >=", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountLessThan(BigDecimal value) { - addCriterion("min_amount <", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountLessThanOrEqualTo(BigDecimal value) { - addCriterion("min_amount <=", value, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountIn(List values) { - addCriterion("min_amount in", values, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountNotIn(List values) { - addCriterion("min_amount not in", values, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("min_amount between", value1, value2, "minAmount"); - return (Criteria) this; - } - - public Criteria andMinAmountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("min_amount not between", value1, value2, "minAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountIsNull() { - addCriterion("max_amount is null"); - return (Criteria) this; - } - - public Criteria andMaxAmountIsNotNull() { - addCriterion("max_amount is not null"); - return (Criteria) this; - } - - public Criteria andMaxAmountEqualTo(BigDecimal value) { - addCriterion("max_amount =", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountNotEqualTo(BigDecimal value) { - addCriterion("max_amount <>", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountGreaterThan(BigDecimal value) { - addCriterion("max_amount >", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("max_amount >=", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountLessThan(BigDecimal value) { - addCriterion("max_amount <", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountLessThanOrEqualTo(BigDecimal value) { - addCriterion("max_amount <=", value, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountIn(List values) { - addCriterion("max_amount in", values, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountNotIn(List values) { - addCriterion("max_amount not in", values, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("max_amount between", value1, value2, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMaxAmountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("max_amount not between", value1, value2, "maxAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountIsNull() { - addCriterion("min_goods_amount is null"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountIsNotNull() { - addCriterion("min_goods_amount is not null"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountEqualTo(BigDecimal value) { - addCriterion("min_goods_amount =", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountNotEqualTo(BigDecimal value) { - addCriterion("min_goods_amount <>", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountGreaterThan(BigDecimal value) { - addCriterion("min_goods_amount >", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("min_goods_amount >=", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountLessThan(BigDecimal value) { - addCriterion("min_goods_amount <", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountLessThanOrEqualTo(BigDecimal value) { - addCriterion("min_goods_amount <=", value, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountIn(List values) { - addCriterion("min_goods_amount in", values, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountNotIn(List values) { - addCriterion("min_goods_amount not in", values, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("min_goods_amount between", value1, value2, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andMinGoodsAmountNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("min_goods_amount not between", value1, value2, "minGoodsAmount"); - return (Criteria) this; - } - - public Criteria andSendStartIsNull() { - addCriterion("send_start is null"); - return (Criteria) this; - } - - public Criteria andSendStartIsNotNull() { - addCriterion("send_start is not null"); - return (Criteria) this; - } - - public Criteria andSendStartEqualTo(LocalDateTime value) { - addCriterion("send_start =", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartNotEqualTo(LocalDateTime value) { - addCriterion("send_start <>", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartGreaterThan(LocalDateTime value) { - addCriterion("send_start >", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("send_start >=", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartLessThan(LocalDateTime value) { - addCriterion("send_start <", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartLessThanOrEqualTo(LocalDateTime value) { - addCriterion("send_start <=", value, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartIn(List values) { - addCriterion("send_start in", values, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartNotIn(List values) { - addCriterion("send_start not in", values, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("send_start between", value1, value2, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendStartNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("send_start not between", value1, value2, "sendStart"); - return (Criteria) this; - } - - public Criteria andSendEndIsNull() { - addCriterion("send_end is null"); - return (Criteria) this; - } - - public Criteria andSendEndIsNotNull() { - addCriterion("send_end is not null"); - return (Criteria) this; - } - - public Criteria andSendEndEqualTo(LocalDateTime value) { - addCriterion("send_end =", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndNotEqualTo(LocalDateTime value) { - addCriterion("send_end <>", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndGreaterThan(LocalDateTime value) { - addCriterion("send_end >", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("send_end >=", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndLessThan(LocalDateTime value) { - addCriterion("send_end <", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndLessThanOrEqualTo(LocalDateTime value) { - addCriterion("send_end <=", value, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndIn(List values) { - addCriterion("send_end in", values, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndNotIn(List values) { - addCriterion("send_end not in", values, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("send_end between", value1, value2, "sendEnd"); - return (Criteria) this; - } - - public Criteria andSendEndNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("send_end not between", value1, value2, "sendEnd"); - return (Criteria) this; - } - - public Criteria andUseStartIsNull() { - addCriterion("use_start is null"); - return (Criteria) this; - } - - public Criteria andUseStartIsNotNull() { - addCriterion("use_start is not null"); - return (Criteria) this; - } - - public Criteria andUseStartEqualTo(LocalDateTime value) { - addCriterion("use_start =", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartNotEqualTo(LocalDateTime value) { - addCriterion("use_start <>", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartGreaterThan(LocalDateTime value) { - addCriterion("use_start >", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("use_start >=", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartLessThan(LocalDateTime value) { - addCriterion("use_start <", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartLessThanOrEqualTo(LocalDateTime value) { - addCriterion("use_start <=", value, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartIn(List values) { - addCriterion("use_start in", values, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartNotIn(List values) { - addCriterion("use_start not in", values, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("use_start between", value1, value2, "useStart"); - return (Criteria) this; - } - - public Criteria andUseStartNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("use_start not between", value1, value2, "useStart"); - return (Criteria) this; - } - - public Criteria andUseEndIsNull() { - addCriterion("use_end is null"); - return (Criteria) this; - } - - public Criteria andUseEndIsNotNull() { - addCriterion("use_end is not null"); - return (Criteria) this; - } - - public Criteria andUseEndEqualTo(LocalDateTime value) { - addCriterion("use_end =", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndNotEqualTo(LocalDateTime value) { - addCriterion("use_end <>", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndGreaterThan(LocalDateTime value) { - addCriterion("use_end >", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("use_end >=", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndLessThan(LocalDateTime value) { - addCriterion("use_end <", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndLessThanOrEqualTo(LocalDateTime value) { - addCriterion("use_end <=", value, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndIn(List values) { - addCriterion("use_end in", values, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndNotIn(List values) { - addCriterion("use_end not in", values, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("use_end between", value1, value2, "useEnd"); - return (Criteria) this; - } - - public Criteria andUseEndNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("use_end not between", value1, value2, "useEnd"); - return (Criteria) this; - } - - public Criteria andAddTimeIsNull() { - addCriterion("add_time is null"); - return (Criteria) this; - } - - public Criteria andAddTimeIsNotNull() { - addCriterion("add_time is not null"); - return (Criteria) this; - } - - public Criteria andAddTimeEqualTo(LocalDateTime value) { - addCriterion("add_time =", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotEqualTo(LocalDateTime value) { - addCriterion("add_time <>", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeGreaterThan(LocalDateTime value) { - addCriterion("add_time >", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("add_time >=", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeLessThan(LocalDateTime value) { - addCriterion("add_time <", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("add_time <=", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeIn(List values) { - addCriterion("add_time in", values, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotIn(List values) { - addCriterion("add_time not in", values, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("add_time between", value1, value2, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("add_time not between", value1, value2, "addTime"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_coupon - * - * @mbg.generated do_not_delete_during_merge - */ - public static class Criteria extends GeneratedCriteria { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private LitemallCouponExample example; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - protected Criteria(LitemallCouponExample example) { - super(); - this.example = example; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallCouponExample example() { - return this.example; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public Criteria andIf(boolean ifAdd, ICriteriaAdd add) { - if (ifAdd) { - add.add(this); - } - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public Criteria andLogicalDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallCoupon.IS_DELETED); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallCoupon.IS_DELETED); - } - - /** - * This interface was generated by MyBatis Generator. - * This interface corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public interface ICriteriaAdd { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - Criteria add(Criteria add); - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_coupon - * - * @mbg.generated - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java index 88a2a9f2..9d73c1ea 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprint.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallFootprint { /** @@ -12,16 +14,6 @@ public class LitemallFootprint { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_footprint - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_footprint @@ -31,16 +23,6 @@ public class LitemallFootprint { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_footprint - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -400,5 +382,20 @@ public class LitemallFootprint { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_footprint + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java index fe4bac26..96416667 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallFootprintExample.java @@ -591,18 +591,6 @@ public class LitemallFootprintExample { return deleted ? andDeletedEqualTo(LitemallFootprint.IS_DELETED) : andDeletedNotEqualTo(LitemallFootprint.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_footprint - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallFootprint.IS_DELETED) : andDeletedNotEqualTo(LitemallFootprint.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_footprint diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java index e83139be..2d495e52 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoods.java @@ -2,6 +2,7 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; public class LitemallGoods { @@ -14,16 +15,6 @@ public class LitemallGoods { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_goods @@ -33,16 +24,6 @@ public class LitemallGoods { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -109,11 +90,11 @@ public class LitemallGoods { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.goods_brief + * This field corresponds to the database column litemall_goods.brief * * @mbg.generated */ - private String goodsBrief; + private String brief; /** * @@ -136,11 +117,11 @@ public class LitemallGoods { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.counter_price + * This field corresponds to the database column litemall_goods.pic_url * * @mbg.generated */ - private BigDecimal counterPrice; + private String picUrl; /** * @@ -151,24 +132,6 @@ public class LitemallGoods { */ private Boolean isNew; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.primary_pic_url - * - * @mbg.generated - */ - private String primaryPicUrl; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.list_pic_url - * - * @mbg.generated - */ - private String listPicUrl; - /** * * This field was generated by MyBatis Generator. @@ -181,11 +144,20 @@ public class LitemallGoods { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.goods_unit + * This field corresponds to the database column litemall_goods.unit * * @mbg.generated */ - private String goodsUnit; + private String unit; + + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_goods.counter_price + * + * @mbg.generated + */ + private BigDecimal counterPrice; /** * @@ -217,11 +189,11 @@ public class LitemallGoods { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods.goods_desc + * This field corresponds to the database column litemall_goods.desc * * @mbg.generated */ - private String goodsDesc; + private String desc; /** * This method was generated by MyBatis Generator. @@ -393,26 +365,26 @@ public class LitemallGoods { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.goods_brief + * This method returns the value of the database column litemall_goods.brief * - * @return the value of litemall_goods.goods_brief + * @return the value of litemall_goods.brief * * @mbg.generated */ - public String getGoodsBrief() { - return goodsBrief; + public String getBrief() { + return brief; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.goods_brief + * This method sets the value of the database column litemall_goods.brief * - * @param goodsBrief the value for litemall_goods.goods_brief + * @param brief the value for litemall_goods.brief * * @mbg.generated */ - public void setGoodsBrief(String goodsBrief) { - this.goodsBrief = goodsBrief; + public void setBrief(String brief) { + this.brief = brief; } /** @@ -465,26 +437,26 @@ public class LitemallGoods { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.counter_price + * This method returns the value of the database column litemall_goods.pic_url * - * @return the value of litemall_goods.counter_price + * @return the value of litemall_goods.pic_url * * @mbg.generated */ - public BigDecimal getCounterPrice() { - return counterPrice; + public String getPicUrl() { + return picUrl; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.counter_price + * This method sets the value of the database column litemall_goods.pic_url * - * @param counterPrice the value for litemall_goods.counter_price + * @param picUrl the value for litemall_goods.pic_url * * @mbg.generated */ - public void setCounterPrice(BigDecimal counterPrice) { - this.counterPrice = counterPrice; + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; } /** @@ -511,54 +483,6 @@ public class LitemallGoods { this.isNew = isNew; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.primary_pic_url - * - * @return the value of litemall_goods.primary_pic_url - * - * @mbg.generated - */ - public String getPrimaryPicUrl() { - return primaryPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.primary_pic_url - * - * @param primaryPicUrl the value for litemall_goods.primary_pic_url - * - * @mbg.generated - */ - public void setPrimaryPicUrl(String primaryPicUrl) { - this.primaryPicUrl = primaryPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.list_pic_url - * - * @return the value of litemall_goods.list_pic_url - * - * @mbg.generated - */ - public String getListPicUrl() { - return listPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.list_pic_url - * - * @param listPicUrl the value for litemall_goods.list_pic_url - * - * @mbg.generated - */ - public void setListPicUrl(String listPicUrl) { - this.listPicUrl = listPicUrl; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_goods.is_hot @@ -585,26 +509,50 @@ public class LitemallGoods { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.goods_unit + * This method returns the value of the database column litemall_goods.unit * - * @return the value of litemall_goods.goods_unit + * @return the value of litemall_goods.unit * * @mbg.generated */ - public String getGoodsUnit() { - return goodsUnit; + public String getUnit() { + return unit; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.goods_unit + * This method sets the value of the database column litemall_goods.unit * - * @param goodsUnit the value for litemall_goods.goods_unit + * @param unit the value for litemall_goods.unit * * @mbg.generated */ - public void setGoodsUnit(String goodsUnit) { - this.goodsUnit = goodsUnit; + public void setUnit(String unit) { + this.unit = unit; + } + + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_goods.counter_price + * + * @return the value of litemall_goods.counter_price + * + * @mbg.generated + */ + public BigDecimal getCounterPrice() { + return counterPrice; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_goods.counter_price + * + * @param counterPrice the value for litemall_goods.counter_price + * + * @mbg.generated + */ + public void setCounterPrice(BigDecimal counterPrice) { + this.counterPrice = counterPrice; } /** @@ -681,26 +629,26 @@ public class LitemallGoods { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods.goods_desc + * This method returns the value of the database column litemall_goods.desc * - * @return the value of litemall_goods.goods_desc + * @return the value of litemall_goods.desc * * @mbg.generated */ - public String getGoodsDesc() { - return goodsDesc; + public String getDesc() { + return desc; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods.goods_desc + * This method sets the value of the database column litemall_goods.desc * - * @param goodsDesc the value for litemall_goods.goods_desc + * @param desc the value for litemall_goods.desc * * @mbg.generated */ - public void setGoodsDesc(String goodsDesc) { - this.goodsDesc = goodsDesc; + public void setDesc(String desc) { + this.desc = desc; } /** @@ -722,19 +670,18 @@ public class LitemallGoods { sb.append(", brandId=").append(brandId); sb.append(", gallery=").append(gallery); sb.append(", keywords=").append(keywords); - sb.append(", goodsBrief=").append(goodsBrief); + sb.append(", brief=").append(brief); sb.append(", isOnSale=").append(isOnSale); sb.append(", sortOrder=").append(sortOrder); - sb.append(", counterPrice=").append(counterPrice); + sb.append(", picUrl=").append(picUrl); sb.append(", isNew=").append(isNew); - sb.append(", primaryPicUrl=").append(primaryPicUrl); - sb.append(", listPicUrl=").append(listPicUrl); sb.append(", isHot=").append(isHot); - sb.append(", goodsUnit=").append(goodsUnit); + sb.append(", unit=").append(unit); + sb.append(", counterPrice=").append(counterPrice); sb.append(", retailPrice=").append(retailPrice); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); - sb.append(", goodsDesc=").append(goodsDesc); + sb.append(", desc=").append(desc); sb.append("]"); return sb.toString(); } @@ -764,19 +711,18 @@ public class LitemallGoods { && (this.getBrandId() == null ? other.getBrandId() == null : this.getBrandId().equals(other.getBrandId())) && (Arrays.equals(this.getGallery(), other.getGallery())) && (this.getKeywords() == null ? other.getKeywords() == null : this.getKeywords().equals(other.getKeywords())) - && (this.getGoodsBrief() == null ? other.getGoodsBrief() == null : this.getGoodsBrief().equals(other.getGoodsBrief())) + && (this.getBrief() == null ? other.getBrief() == null : this.getBrief().equals(other.getBrief())) && (this.getIsOnSale() == null ? other.getIsOnSale() == null : this.getIsOnSale().equals(other.getIsOnSale())) && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) - && (this.getCounterPrice() == null ? other.getCounterPrice() == null : this.getCounterPrice().equals(other.getCounterPrice())) + && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getIsNew() == null ? other.getIsNew() == null : this.getIsNew().equals(other.getIsNew())) - && (this.getPrimaryPicUrl() == null ? other.getPrimaryPicUrl() == null : this.getPrimaryPicUrl().equals(other.getPrimaryPicUrl())) - && (this.getListPicUrl() == null ? other.getListPicUrl() == null : this.getListPicUrl().equals(other.getListPicUrl())) && (this.getIsHot() == null ? other.getIsHot() == null : this.getIsHot().equals(other.getIsHot())) - && (this.getGoodsUnit() == null ? other.getGoodsUnit() == null : this.getGoodsUnit().equals(other.getGoodsUnit())) + && (this.getUnit() == null ? other.getUnit() == null : this.getUnit().equals(other.getUnit())) + && (this.getCounterPrice() == null ? other.getCounterPrice() == null : this.getCounterPrice().equals(other.getCounterPrice())) && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())) - && (this.getGoodsDesc() == null ? other.getGoodsDesc() == null : this.getGoodsDesc().equals(other.getGoodsDesc())); + && (this.getDesc() == null ? other.getDesc() == null : this.getDesc().equals(other.getDesc())); } /** @@ -796,19 +742,18 @@ public class LitemallGoods { result = prime * result + ((getBrandId() == null) ? 0 : getBrandId().hashCode()); result = prime * result + (Arrays.hashCode(getGallery())); result = prime * result + ((getKeywords() == null) ? 0 : getKeywords().hashCode()); - result = prime * result + ((getGoodsBrief() == null) ? 0 : getGoodsBrief().hashCode()); + result = prime * result + ((getBrief() == null) ? 0 : getBrief().hashCode()); result = prime * result + ((getIsOnSale() == null) ? 0 : getIsOnSale().hashCode()); result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); - result = prime * result + ((getCounterPrice() == null) ? 0 : getCounterPrice().hashCode()); + result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getIsNew() == null) ? 0 : getIsNew().hashCode()); - result = prime * result + ((getPrimaryPicUrl() == null) ? 0 : getPrimaryPicUrl().hashCode()); - result = prime * result + ((getListPicUrl() == null) ? 0 : getListPicUrl().hashCode()); result = prime * result + ((getIsHot() == null) ? 0 : getIsHot().hashCode()); - result = prime * result + ((getGoodsUnit() == null) ? 0 : getGoodsUnit().hashCode()); + result = prime * result + ((getUnit() == null) ? 0 : getUnit().hashCode()); + result = prime * result + ((getCounterPrice() == null) ? 0 : getCounterPrice().hashCode()); result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); - result = prime * result + ((getGoodsDesc() == null) ? 0 : getGoodsDesc().hashCode()); + result = prime * result + ((getDesc() == null) ? 0 : getDesc().hashCode()); return result; } @@ -836,21 +781,20 @@ public class LitemallGoods { name("name", "name", "VARCHAR"), categoryId("category_id", "categoryId", "INTEGER"), brandId("brand_id", "brandId", "INTEGER"), - gallery("gallery", "gallery", "CHAR"), + gallery("gallery", "gallery", "VARCHAR"), keywords("keywords", "keywords", "VARCHAR"), - goodsBrief("goods_brief", "goodsBrief", "VARCHAR"), + brief("brief", "brief", "VARCHAR"), isOnSale("is_on_sale", "isOnSale", "BIT"), sortOrder("sort_order", "sortOrder", "SMALLINT"), - counterPrice("counter_price", "counterPrice", "DECIMAL"), + picUrl("pic_url", "picUrl", "VARCHAR"), isNew("is_new", "isNew", "BIT"), - primaryPicUrl("primary_pic_url", "primaryPicUrl", "VARCHAR"), - listPicUrl("list_pic_url", "listPicUrl", "VARCHAR"), isHot("is_hot", "isHot", "BIT"), - goodsUnit("goods_unit", "goodsUnit", "VARCHAR"), + unit("unit", "unit", "VARCHAR"), + counterPrice("counter_price", "counterPrice", "DECIMAL"), retailPrice("retail_price", "retailPrice", "DECIMAL"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"), - goodsDesc("goods_desc", "goodsDesc", "LONGVARCHAR"); + desc("desc", "desc", "LONGVARCHAR"); /** * This field was generated by MyBatis Generator. @@ -957,5 +901,20 @@ public class LitemallGoods { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_goods + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttribute.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttribute.java index 9523a9e4..234f160a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttribute.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttribute.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallGoodsAttribute { /** @@ -12,16 +14,6 @@ public class LitemallGoodsAttribute { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods_attribute - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_goods_attribute @@ -31,16 +23,6 @@ public class LitemallGoodsAttribute { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods_attribute - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -59,15 +41,6 @@ public class LitemallGoodsAttribute { */ private Integer goodsId; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods_attribute.value - * - * @mbg.generated - */ - private String value; - /** * * This field was generated by MyBatis Generator. @@ -77,6 +50,15 @@ public class LitemallGoodsAttribute { */ private String attribute; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_goods_attribute.value + * + * @mbg.generated + */ + private String value; + /** * * This field was generated by MyBatis Generator. @@ -143,30 +125,6 @@ public class LitemallGoodsAttribute { this.goodsId = goodsId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods_attribute.value - * - * @return the value of litemall_goods_attribute.value - * - * @mbg.generated - */ - public String getValue() { - return value; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods_attribute.value - * - * @param value the value for litemall_goods_attribute.value - * - * @mbg.generated - */ - public void setValue(String value) { - this.value = value; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_goods_attribute.attribute @@ -191,6 +149,30 @@ public class LitemallGoodsAttribute { this.attribute = attribute; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_goods_attribute.value + * + * @return the value of litemall_goods_attribute.value + * + * @mbg.generated + */ + public String getValue() { + return value; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_goods_attribute.value + * + * @param value the value for litemall_goods_attribute.value + * + * @mbg.generated + */ + public void setValue(String value) { + this.value = value; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_goods_attribute.add_time @@ -253,8 +235,8 @@ public class LitemallGoodsAttribute { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", goodsId=").append(goodsId); - sb.append(", value=").append(value); sb.append(", attribute=").append(attribute); + sb.append(", value=").append(value); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append("]"); @@ -281,8 +263,8 @@ public class LitemallGoodsAttribute { LitemallGoodsAttribute other = (LitemallGoodsAttribute) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) - && (this.getValue() == null ? other.getValue() == null : this.getValue().equals(other.getValue())) && (this.getAttribute() == null ? other.getAttribute() == null : this.getAttribute().equals(other.getAttribute())) + && (this.getValue() == null ? other.getValue() == null : this.getValue().equals(other.getValue())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); } @@ -299,8 +281,8 @@ public class LitemallGoodsAttribute { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); - result = prime * result + ((getValue() == null) ? 0 : getValue().hashCode()); result = prime * result + ((getAttribute() == null) ? 0 : getAttribute().hashCode()); + result = prime * result + ((getValue() == null) ? 0 : getValue().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); return result; @@ -327,8 +309,8 @@ public class LitemallGoodsAttribute { public enum Column { id("id", "id", "INTEGER"), goodsId("goods_id", "goodsId", "INTEGER"), - value("value", "value", "VARCHAR"), attribute("attribute", "attribute", "VARCHAR"), + value("value", "value", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -437,5 +419,20 @@ public class LitemallGoodsAttribute { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_goods_attribute + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttributeExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttributeExample.java index ff200720..97f2969d 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttributeExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsAttributeExample.java @@ -346,76 +346,6 @@ public class LitemallGoodsAttributeExample { return (Criteria) this; } - public Criteria andValueIsNull() { - addCriterion("`value` is null"); - return (Criteria) this; - } - - public Criteria andValueIsNotNull() { - addCriterion("`value` is not null"); - return (Criteria) this; - } - - public Criteria andValueEqualTo(String value) { - addCriterion("`value` =", value, "value"); - return (Criteria) this; - } - - public Criteria andValueNotEqualTo(String value) { - addCriterion("`value` <>", value, "value"); - return (Criteria) this; - } - - public Criteria andValueGreaterThan(String value) { - addCriterion("`value` >", value, "value"); - return (Criteria) this; - } - - public Criteria andValueGreaterThanOrEqualTo(String value) { - addCriterion("`value` >=", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLessThan(String value) { - addCriterion("`value` <", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLessThanOrEqualTo(String value) { - addCriterion("`value` <=", value, "value"); - return (Criteria) this; - } - - public Criteria andValueLike(String value) { - addCriterion("`value` like", value, "value"); - return (Criteria) this; - } - - public Criteria andValueNotLike(String value) { - addCriterion("`value` not like", value, "value"); - return (Criteria) this; - } - - public Criteria andValueIn(List values) { - addCriterion("`value` in", values, "value"); - return (Criteria) this; - } - - public Criteria andValueNotIn(List values) { - addCriterion("`value` not in", values, "value"); - return (Criteria) this; - } - - public Criteria andValueBetween(String value1, String value2) { - addCriterion("`value` between", value1, value2, "value"); - return (Criteria) this; - } - - public Criteria andValueNotBetween(String value1, String value2) { - addCriterion("`value` not between", value1, value2, "value"); - return (Criteria) this; - } - public Criteria andAttributeIsNull() { addCriterion("`attribute` is null"); return (Criteria) this; @@ -486,6 +416,76 @@ public class LitemallGoodsAttributeExample { return (Criteria) this; } + public Criteria andValueIsNull() { + addCriterion("`value` is null"); + return (Criteria) this; + } + + public Criteria andValueIsNotNull() { + addCriterion("`value` is not null"); + return (Criteria) this; + } + + public Criteria andValueEqualTo(String value) { + addCriterion("`value` =", value, "value"); + return (Criteria) this; + } + + public Criteria andValueNotEqualTo(String value) { + addCriterion("`value` <>", value, "value"); + return (Criteria) this; + } + + public Criteria andValueGreaterThan(String value) { + addCriterion("`value` >", value, "value"); + return (Criteria) this; + } + + public Criteria andValueGreaterThanOrEqualTo(String value) { + addCriterion("`value` >=", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLessThan(String value) { + addCriterion("`value` <", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLessThanOrEqualTo(String value) { + addCriterion("`value` <=", value, "value"); + return (Criteria) this; + } + + public Criteria andValueLike(String value) { + addCriterion("`value` like", value, "value"); + return (Criteria) this; + } + + public Criteria andValueNotLike(String value) { + addCriterion("`value` not like", value, "value"); + return (Criteria) this; + } + + public Criteria andValueIn(List values) { + addCriterion("`value` in", values, "value"); + return (Criteria) this; + } + + public Criteria andValueNotIn(List values) { + addCriterion("`value` not in", values, "value"); + return (Criteria) this; + } + + public Criteria andValueBetween(String value1, String value2) { + addCriterion("`value` between", value1, value2, "value"); + return (Criteria) this; + } + + public Criteria andValueNotBetween(String value1, String value2) { + addCriterion("`value` not between", value1, value2, "value"); + return (Criteria) this; + } + public Criteria andAddTimeIsNull() { addCriterion("add_time is null"); return (Criteria) this; @@ -671,18 +671,6 @@ public class LitemallGoodsAttributeExample { return deleted ? andDeletedEqualTo(LitemallGoodsAttribute.IS_DELETED) : andDeletedNotEqualTo(LitemallGoodsAttribute.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_goods_attribute - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallGoodsAttribute.IS_DELETED) : andDeletedNotEqualTo(LitemallGoodsAttribute.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_goods_attribute diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java index 44432cfb..1da663ee 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsExample.java @@ -721,73 +721,73 @@ public class LitemallGoodsExample { return (Criteria) this; } - public Criteria andGoodsBriefIsNull() { - addCriterion("goods_brief is null"); + public Criteria andBriefIsNull() { + addCriterion("brief is null"); return (Criteria) this; } - public Criteria andGoodsBriefIsNotNull() { - addCriterion("goods_brief is not null"); + public Criteria andBriefIsNotNull() { + addCriterion("brief is not null"); return (Criteria) this; } - public Criteria andGoodsBriefEqualTo(String value) { - addCriterion("goods_brief =", value, "goodsBrief"); + public Criteria andBriefEqualTo(String value) { + addCriterion("brief =", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefNotEqualTo(String value) { - addCriterion("goods_brief <>", value, "goodsBrief"); + public Criteria andBriefNotEqualTo(String value) { + addCriterion("brief <>", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefGreaterThan(String value) { - addCriterion("goods_brief >", value, "goodsBrief"); + public Criteria andBriefGreaterThan(String value) { + addCriterion("brief >", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefGreaterThanOrEqualTo(String value) { - addCriterion("goods_brief >=", value, "goodsBrief"); + public Criteria andBriefGreaterThanOrEqualTo(String value) { + addCriterion("brief >=", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefLessThan(String value) { - addCriterion("goods_brief <", value, "goodsBrief"); + public Criteria andBriefLessThan(String value) { + addCriterion("brief <", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefLessThanOrEqualTo(String value) { - addCriterion("goods_brief <=", value, "goodsBrief"); + public Criteria andBriefLessThanOrEqualTo(String value) { + addCriterion("brief <=", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefLike(String value) { - addCriterion("goods_brief like", value, "goodsBrief"); + public Criteria andBriefLike(String value) { + addCriterion("brief like", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefNotLike(String value) { - addCriterion("goods_brief not like", value, "goodsBrief"); + public Criteria andBriefNotLike(String value) { + addCriterion("brief not like", value, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefIn(List values) { - addCriterion("goods_brief in", values, "goodsBrief"); + public Criteria andBriefIn(List values) { + addCriterion("brief in", values, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefNotIn(List values) { - addCriterion("goods_brief not in", values, "goodsBrief"); + public Criteria andBriefNotIn(List values) { + addCriterion("brief not in", values, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefBetween(String value1, String value2) { - addCriterion("goods_brief between", value1, value2, "goodsBrief"); + public Criteria andBriefBetween(String value1, String value2) { + addCriterion("brief between", value1, value2, "brief"); return (Criteria) this; } - public Criteria andGoodsBriefNotBetween(String value1, String value2) { - addCriterion("goods_brief not between", value1, value2, "goodsBrief"); + public Criteria andBriefNotBetween(String value1, String value2) { + addCriterion("brief not between", value1, value2, "brief"); return (Criteria) this; } @@ -911,63 +911,73 @@ public class LitemallGoodsExample { return (Criteria) this; } - public Criteria andCounterPriceIsNull() { - addCriterion("counter_price is null"); + public Criteria andPicUrlIsNull() { + addCriterion("pic_url is null"); return (Criteria) this; } - public Criteria andCounterPriceIsNotNull() { - addCriterion("counter_price is not null"); + public Criteria andPicUrlIsNotNull() { + addCriterion("pic_url is not null"); return (Criteria) this; } - public Criteria andCounterPriceEqualTo(BigDecimal value) { - addCriterion("counter_price =", value, "counterPrice"); + public Criteria andPicUrlEqualTo(String value) { + addCriterion("pic_url =", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceNotEqualTo(BigDecimal value) { - addCriterion("counter_price <>", value, "counterPrice"); + public Criteria andPicUrlNotEqualTo(String value) { + addCriterion("pic_url <>", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceGreaterThan(BigDecimal value) { - addCriterion("counter_price >", value, "counterPrice"); + public Criteria andPicUrlGreaterThan(String value) { + addCriterion("pic_url >", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("counter_price >=", value, "counterPrice"); + public Criteria andPicUrlGreaterThanOrEqualTo(String value) { + addCriterion("pic_url >=", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceLessThan(BigDecimal value) { - addCriterion("counter_price <", value, "counterPrice"); + public Criteria andPicUrlLessThan(String value) { + addCriterion("pic_url <", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("counter_price <=", value, "counterPrice"); + public Criteria andPicUrlLessThanOrEqualTo(String value) { + addCriterion("pic_url <=", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceIn(List values) { - addCriterion("counter_price in", values, "counterPrice"); + public Criteria andPicUrlLike(String value) { + addCriterion("pic_url like", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceNotIn(List values) { - addCriterion("counter_price not in", values, "counterPrice"); + public Criteria andPicUrlNotLike(String value) { + addCriterion("pic_url not like", value, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("counter_price between", value1, value2, "counterPrice"); + public Criteria andPicUrlIn(List values) { + addCriterion("pic_url in", values, "picUrl"); return (Criteria) this; } - public Criteria andCounterPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("counter_price not between", value1, value2, "counterPrice"); + public Criteria andPicUrlNotIn(List values) { + addCriterion("pic_url not in", values, "picUrl"); + return (Criteria) this; + } + + public Criteria andPicUrlBetween(String value1, String value2) { + addCriterion("pic_url between", value1, value2, "picUrl"); + return (Criteria) this; + } + + public Criteria andPicUrlNotBetween(String value1, String value2) { + addCriterion("pic_url not between", value1, value2, "picUrl"); return (Criteria) this; } @@ -1031,146 +1041,6 @@ public class LitemallGoodsExample { return (Criteria) this; } - public Criteria andPrimaryPicUrlIsNull() { - addCriterion("primary_pic_url is null"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlIsNotNull() { - addCriterion("primary_pic_url is not null"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlEqualTo(String value) { - addCriterion("primary_pic_url =", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlNotEqualTo(String value) { - addCriterion("primary_pic_url <>", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlGreaterThan(String value) { - addCriterion("primary_pic_url >", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("primary_pic_url >=", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlLessThan(String value) { - addCriterion("primary_pic_url <", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlLessThanOrEqualTo(String value) { - addCriterion("primary_pic_url <=", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlLike(String value) { - addCriterion("primary_pic_url like", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlNotLike(String value) { - addCriterion("primary_pic_url not like", value, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlIn(List values) { - addCriterion("primary_pic_url in", values, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlNotIn(List values) { - addCriterion("primary_pic_url not in", values, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlBetween(String value1, String value2) { - addCriterion("primary_pic_url between", value1, value2, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andPrimaryPicUrlNotBetween(String value1, String value2) { - addCriterion("primary_pic_url not between", value1, value2, "primaryPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlIsNull() { - addCriterion("list_pic_url is null"); - return (Criteria) this; - } - - public Criteria andListPicUrlIsNotNull() { - addCriterion("list_pic_url is not null"); - return (Criteria) this; - } - - public Criteria andListPicUrlEqualTo(String value) { - addCriterion("list_pic_url =", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlNotEqualTo(String value) { - addCriterion("list_pic_url <>", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlGreaterThan(String value) { - addCriterion("list_pic_url >", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("list_pic_url >=", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlLessThan(String value) { - addCriterion("list_pic_url <", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlLessThanOrEqualTo(String value) { - addCriterion("list_pic_url <=", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlLike(String value) { - addCriterion("list_pic_url like", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlNotLike(String value) { - addCriterion("list_pic_url not like", value, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlIn(List values) { - addCriterion("list_pic_url in", values, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlNotIn(List values) { - addCriterion("list_pic_url not in", values, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlBetween(String value1, String value2) { - addCriterion("list_pic_url between", value1, value2, "listPicUrl"); - return (Criteria) this; - } - - public Criteria andListPicUrlNotBetween(String value1, String value2) { - addCriterion("list_pic_url not between", value1, value2, "listPicUrl"); - return (Criteria) this; - } - public Criteria andIsHotIsNull() { addCriterion("is_hot is null"); return (Criteria) this; @@ -1231,73 +1101,133 @@ public class LitemallGoodsExample { return (Criteria) this; } - public Criteria andGoodsUnitIsNull() { - addCriterion("goods_unit is null"); + public Criteria andUnitIsNull() { + addCriterion("unit is null"); return (Criteria) this; } - public Criteria andGoodsUnitIsNotNull() { - addCriterion("goods_unit is not null"); + public Criteria andUnitIsNotNull() { + addCriterion("unit is not null"); return (Criteria) this; } - public Criteria andGoodsUnitEqualTo(String value) { - addCriterion("goods_unit =", value, "goodsUnit"); + public Criteria andUnitEqualTo(String value) { + addCriterion("unit =", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitNotEqualTo(String value) { - addCriterion("goods_unit <>", value, "goodsUnit"); + public Criteria andUnitNotEqualTo(String value) { + addCriterion("unit <>", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitGreaterThan(String value) { - addCriterion("goods_unit >", value, "goodsUnit"); + public Criteria andUnitGreaterThan(String value) { + addCriterion("unit >", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitGreaterThanOrEqualTo(String value) { - addCriterion("goods_unit >=", value, "goodsUnit"); + public Criteria andUnitGreaterThanOrEqualTo(String value) { + addCriterion("unit >=", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitLessThan(String value) { - addCriterion("goods_unit <", value, "goodsUnit"); + public Criteria andUnitLessThan(String value) { + addCriterion("unit <", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitLessThanOrEqualTo(String value) { - addCriterion("goods_unit <=", value, "goodsUnit"); + public Criteria andUnitLessThanOrEqualTo(String value) { + addCriterion("unit <=", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitLike(String value) { - addCriterion("goods_unit like", value, "goodsUnit"); + public Criteria andUnitLike(String value) { + addCriterion("unit like", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitNotLike(String value) { - addCriterion("goods_unit not like", value, "goodsUnit"); + public Criteria andUnitNotLike(String value) { + addCriterion("unit not like", value, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitIn(List values) { - addCriterion("goods_unit in", values, "goodsUnit"); + public Criteria andUnitIn(List values) { + addCriterion("unit in", values, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitNotIn(List values) { - addCriterion("goods_unit not in", values, "goodsUnit"); + public Criteria andUnitNotIn(List values) { + addCriterion("unit not in", values, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitBetween(String value1, String value2) { - addCriterion("goods_unit between", value1, value2, "goodsUnit"); + public Criteria andUnitBetween(String value1, String value2) { + addCriterion("unit between", value1, value2, "unit"); return (Criteria) this; } - public Criteria andGoodsUnitNotBetween(String value1, String value2) { - addCriterion("goods_unit not between", value1, value2, "goodsUnit"); + public Criteria andUnitNotBetween(String value1, String value2) { + addCriterion("unit not between", value1, value2, "unit"); + return (Criteria) this; + } + + public Criteria andCounterPriceIsNull() { + addCriterion("counter_price is null"); + return (Criteria) this; + } + + public Criteria andCounterPriceIsNotNull() { + addCriterion("counter_price is not null"); + return (Criteria) this; + } + + public Criteria andCounterPriceEqualTo(BigDecimal value) { + addCriterion("counter_price =", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceNotEqualTo(BigDecimal value) { + addCriterion("counter_price <>", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceGreaterThan(BigDecimal value) { + addCriterion("counter_price >", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("counter_price >=", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceLessThan(BigDecimal value) { + addCriterion("counter_price <", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("counter_price <=", value, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceIn(List values) { + addCriterion("counter_price in", values, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceNotIn(List values) { + addCriterion("counter_price not in", values, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("counter_price between", value1, value2, "counterPrice"); + return (Criteria) this; + } + + public Criteria andCounterPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("counter_price not between", value1, value2, "counterPrice"); return (Criteria) this; } @@ -1546,18 +1476,6 @@ public class LitemallGoodsExample { return deleted ? andDeletedEqualTo(LitemallGoods.IS_DELETED) : andDeletedNotEqualTo(LitemallGoods.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallGoods.IS_DELETED) : andDeletedNotEqualTo(LitemallGoods.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_goods diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecification.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecification.java index e6c38383..c0f60822 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecification.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecification.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallGoodsSpecification { /** @@ -12,16 +14,6 @@ public class LitemallGoodsSpecification { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods_specification - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_goods_specification @@ -31,16 +23,6 @@ public class LitemallGoodsSpecification { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_goods_specification - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -59,6 +41,15 @@ public class LitemallGoodsSpecification { */ private Integer goodsId; + /** + * + * This field was generated by MyBatis Generator. + * This field corresponds to the database column litemall_goods_specification.specification + * + * @mbg.generated + */ + private String specification; + /** * * This field was generated by MyBatis Generator. @@ -77,15 +68,6 @@ public class LitemallGoodsSpecification { */ private String picUrl; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_goods_specification.specification - * - * @mbg.generated - */ - private String specification; - /** * * This field was generated by MyBatis Generator. @@ -152,6 +134,30 @@ public class LitemallGoodsSpecification { this.goodsId = goodsId; } + /** + * This method was generated by MyBatis Generator. + * This method returns the value of the database column litemall_goods_specification.specification + * + * @return the value of litemall_goods_specification.specification + * + * @mbg.generated + */ + public String getSpecification() { + return specification; + } + + /** + * This method was generated by MyBatis Generator. + * This method sets the value of the database column litemall_goods_specification.specification + * + * @param specification the value for litemall_goods_specification.specification + * + * @mbg.generated + */ + public void setSpecification(String specification) { + this.specification = specification; + } + /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_goods_specification.value @@ -200,30 +206,6 @@ public class LitemallGoodsSpecification { this.picUrl = picUrl; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_goods_specification.specification - * - * @return the value of litemall_goods_specification.specification - * - * @mbg.generated - */ - public String getSpecification() { - return specification; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_goods_specification.specification - * - * @param specification the value for litemall_goods_specification.specification - * - * @mbg.generated - */ - public void setSpecification(String specification) { - this.specification = specification; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_goods_specification.add_time @@ -286,9 +268,9 @@ public class LitemallGoodsSpecification { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", goodsId=").append(goodsId); + sb.append(", specification=").append(specification); sb.append(", value=").append(value); sb.append(", picUrl=").append(picUrl); - sb.append(", specification=").append(specification); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append("]"); @@ -315,9 +297,9 @@ public class LitemallGoodsSpecification { LitemallGoodsSpecification other = (LitemallGoodsSpecification) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) + && (this.getSpecification() == null ? other.getSpecification() == null : this.getSpecification().equals(other.getSpecification())) && (this.getValue() == null ? other.getValue() == null : this.getValue().equals(other.getValue())) && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) - && (this.getSpecification() == null ? other.getSpecification() == null : this.getSpecification().equals(other.getSpecification())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); } @@ -334,9 +316,9 @@ public class LitemallGoodsSpecification { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); + result = prime * result + ((getSpecification() == null) ? 0 : getSpecification().hashCode()); result = prime * result + ((getValue() == null) ? 0 : getValue().hashCode()); result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); - result = prime * result + ((getSpecification() == null) ? 0 : getSpecification().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); return result; @@ -363,9 +345,9 @@ public class LitemallGoodsSpecification { public enum Column { id("id", "id", "INTEGER"), goodsId("goods_id", "goodsId", "INTEGER"), + specification("specification", "specification", "VARCHAR"), value("value", "value", "VARCHAR"), picUrl("pic_url", "picUrl", "VARCHAR"), - specification("specification", "specification", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -474,5 +456,20 @@ public class LitemallGoodsSpecification { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_goods_specification + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecificationExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecificationExample.java index 61a5d939..b763045d 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecificationExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallGoodsSpecificationExample.java @@ -346,6 +346,76 @@ public class LitemallGoodsSpecificationExample { return (Criteria) this; } + public Criteria andSpecificationIsNull() { + addCriterion("specification is null"); + return (Criteria) this; + } + + public Criteria andSpecificationIsNotNull() { + addCriterion("specification is not null"); + return (Criteria) this; + } + + public Criteria andSpecificationEqualTo(String value) { + addCriterion("specification =", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationNotEqualTo(String value) { + addCriterion("specification <>", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationGreaterThan(String value) { + addCriterion("specification >", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationGreaterThanOrEqualTo(String value) { + addCriterion("specification >=", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationLessThan(String value) { + addCriterion("specification <", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationLessThanOrEqualTo(String value) { + addCriterion("specification <=", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationLike(String value) { + addCriterion("specification like", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationNotLike(String value) { + addCriterion("specification not like", value, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationIn(List values) { + addCriterion("specification in", values, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationNotIn(List values) { + addCriterion("specification not in", values, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationBetween(String value1, String value2) { + addCriterion("specification between", value1, value2, "specification"); + return (Criteria) this; + } + + public Criteria andSpecificationNotBetween(String value1, String value2) { + addCriterion("specification not between", value1, value2, "specification"); + return (Criteria) this; + } + public Criteria andValueIsNull() { addCriterion("`value` is null"); return (Criteria) this; @@ -486,76 +556,6 @@ public class LitemallGoodsSpecificationExample { return (Criteria) this; } - public Criteria andSpecificationIsNull() { - addCriterion("specification is null"); - return (Criteria) this; - } - - public Criteria andSpecificationIsNotNull() { - addCriterion("specification is not null"); - return (Criteria) this; - } - - public Criteria andSpecificationEqualTo(String value) { - addCriterion("specification =", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationNotEqualTo(String value) { - addCriterion("specification <>", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationGreaterThan(String value) { - addCriterion("specification >", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationGreaterThanOrEqualTo(String value) { - addCriterion("specification >=", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationLessThan(String value) { - addCriterion("specification <", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationLessThanOrEqualTo(String value) { - addCriterion("specification <=", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationLike(String value) { - addCriterion("specification like", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationNotLike(String value) { - addCriterion("specification not like", value, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationIn(List values) { - addCriterion("specification in", values, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationNotIn(List values) { - addCriterion("specification not in", values, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationBetween(String value1, String value2) { - addCriterion("specification between", value1, value2, "specification"); - return (Criteria) this; - } - - public Criteria andSpecificationNotBetween(String value1, String value2) { - addCriterion("specification not between", value1, value2, "specification"); - return (Criteria) this; - } - public Criteria andAddTimeIsNull() { addCriterion("add_time is null"); return (Criteria) this; @@ -741,18 +741,6 @@ public class LitemallGoodsSpecificationExample { return deleted ? andDeletedEqualTo(LitemallGoodsSpecification.IS_DELETED) : andDeletedNotEqualTo(LitemallGoodsSpecification.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_goods_specification - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallGoodsSpecification.IS_DELETED) : andDeletedNotEqualTo(LitemallGoodsSpecification.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_goods_specification diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssue.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssue.java index 6486a014..643231e6 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssue.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssue.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallIssue { /** @@ -12,16 +14,6 @@ public class LitemallIssue { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_issue - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_issue @@ -31,16 +23,6 @@ public class LitemallIssue { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_issue - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -400,5 +382,20 @@ public class LitemallIssue { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_issue + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssueExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssueExample.java index 4d32a493..d536a44a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssueExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallIssueExample.java @@ -611,18 +611,6 @@ public class LitemallIssueExample { return deleted ? andDeletedEqualTo(LitemallIssue.IS_DELETED) : andDeletedNotEqualTo(LitemallIssue.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_issue - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallIssue.IS_DELETED) : andDeletedNotEqualTo(LitemallIssue.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_issue diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeyword.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeyword.java index d6bf6698..9c1b963e 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeyword.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeyword.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallKeyword { /** @@ -12,16 +14,6 @@ public class LitemallKeyword { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_keyword - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_keyword @@ -31,16 +23,6 @@ public class LitemallKeyword { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_keyword - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -86,15 +68,6 @@ public class LitemallKeyword { */ private Boolean isDefault; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_keyword.is_show - * - * @mbg.generated - */ - private Boolean isShow; - /** * * This field was generated by MyBatis Generator. @@ -242,30 +215,6 @@ public class LitemallKeyword { this.isDefault = isDefault; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_keyword.is_show - * - * @return the value of litemall_keyword.is_show - * - * @mbg.generated - */ - public Boolean getIsShow() { - return isShow; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_keyword.is_show - * - * @param isShow the value for litemall_keyword.is_show - * - * @mbg.generated - */ - public void setIsShow(Boolean isShow) { - this.isShow = isShow; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_keyword.sort_order @@ -355,7 +304,6 @@ public class LitemallKeyword { sb.append(", url=").append(url); sb.append(", isHot=").append(isHot); sb.append(", isDefault=").append(isDefault); - sb.append(", isShow=").append(isShow); sb.append(", sortOrder=").append(sortOrder); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); @@ -386,7 +334,6 @@ public class LitemallKeyword { && (this.getUrl() == null ? other.getUrl() == null : this.getUrl().equals(other.getUrl())) && (this.getIsHot() == null ? other.getIsHot() == null : this.getIsHot().equals(other.getIsHot())) && (this.getIsDefault() == null ? other.getIsDefault() == null : this.getIsDefault().equals(other.getIsDefault())) - && (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow())) && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); @@ -407,7 +354,6 @@ public class LitemallKeyword { result = prime * result + ((getUrl() == null) ? 0 : getUrl().hashCode()); result = prime * result + ((getIsHot() == null) ? 0 : getIsHot().hashCode()); result = prime * result + ((getIsDefault() == null) ? 0 : getIsDefault().hashCode()); - result = prime * result + ((getIsShow() == null) ? 0 : getIsShow().hashCode()); result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); @@ -438,7 +384,6 @@ public class LitemallKeyword { url("url", "url", "VARCHAR"), isHot("is_hot", "isHot", "BIT"), isDefault("is_default", "isDefault", "BIT"), - isShow("is_show", "isShow", "BIT"), sortOrder("sort_order", "sortOrder", "INTEGER"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -548,5 +493,20 @@ public class LitemallKeyword { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_keyword + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeywordExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeywordExample.java index 586bfba1..580a4ba8 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeywordExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallKeywordExample.java @@ -546,66 +546,6 @@ public class LitemallKeywordExample { return (Criteria) this; } - public Criteria andIsShowIsNull() { - addCriterion("is_show is null"); - return (Criteria) this; - } - - public Criteria andIsShowIsNotNull() { - addCriterion("is_show is not null"); - return (Criteria) this; - } - - public Criteria andIsShowEqualTo(Boolean value) { - addCriterion("is_show =", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotEqualTo(Boolean value) { - addCriterion("is_show <>", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThan(Boolean value) { - addCriterion("is_show >", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_show >=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThan(Boolean value) { - addCriterion("is_show <", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowLessThanOrEqualTo(Boolean value) { - addCriterion("is_show <=", value, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowIn(List values) { - addCriterion("is_show in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotIn(List values) { - addCriterion("is_show not in", values, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowBetween(Boolean value1, Boolean value2) { - addCriterion("is_show between", value1, value2, "isShow"); - return (Criteria) this; - } - - public Criteria andIsShowNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_show not between", value1, value2, "isShow"); - return (Criteria) this; - } - public Criteria andSortOrderIsNull() { addCriterion("sort_order is null"); return (Criteria) this; @@ -851,18 +791,6 @@ public class LitemallKeywordExample { return deleted ? andDeletedEqualTo(LitemallKeyword.IS_DELETED) : andDeletedNotEqualTo(LitemallKeyword.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_keyword - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallKeyword.IS_DELETED) : andDeletedNotEqualTo(LitemallKeyword.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_keyword 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 d1652ba4..c0058d98 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 @@ -2,6 +2,8 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallOrder { /** @@ -13,16 +15,6 @@ public class LitemallOrder { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_order - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_order @@ -32,16 +24,6 @@ public class LitemallOrder { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_order - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -168,15 +150,6 @@ public class LitemallOrder { */ private String payId; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order.pay_status - * - * @mbg.generated - */ - private Short payStatus; - /** * * This field was generated by MyBatis Generator. @@ -207,20 +180,11 @@ public class LitemallOrder { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order.ship_start_time + * This field corresponds to the database column litemall_order.ship_time * * @mbg.generated */ - private LocalDateTime shipStartTime; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order.ship_end_time - * - * @mbg.generated - */ - private LocalDateTime shipEndTime; + private LocalDateTime shipTime; /** * @@ -594,30 +558,6 @@ public class LitemallOrder { this.payId = payId; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order.pay_status - * - * @return the value of litemall_order.pay_status - * - * @mbg.generated - */ - public Short getPayStatus() { - return payStatus; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order.pay_status - * - * @param payStatus the value for litemall_order.pay_status - * - * @mbg.generated - */ - public void setPayStatus(Short payStatus) { - this.payStatus = payStatus; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_order.pay_time @@ -692,50 +632,26 @@ public class LitemallOrder { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order.ship_start_time + * This method returns the value of the database column litemall_order.ship_time * - * @return the value of litemall_order.ship_start_time + * @return the value of litemall_order.ship_time * * @mbg.generated */ - public LocalDateTime getShipStartTime() { - return shipStartTime; + public LocalDateTime getShipTime() { + return shipTime; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order.ship_start_time + * This method sets the value of the database column litemall_order.ship_time * - * @param shipStartTime the value for litemall_order.ship_start_time + * @param shipTime the value for litemall_order.ship_time * * @mbg.generated */ - public void setShipStartTime(LocalDateTime shipStartTime) { - this.shipStartTime = shipStartTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order.ship_end_time - * - * @return the value of litemall_order.ship_end_time - * - * @mbg.generated - */ - public LocalDateTime getShipEndTime() { - return shipEndTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order.ship_end_time - * - * @param shipEndTime the value for litemall_order.ship_end_time - * - * @mbg.generated - */ - public void setShipEndTime(LocalDateTime shipEndTime) { - this.shipEndTime = shipEndTime; + public void setShipTime(LocalDateTime shipTime) { + this.shipTime = shipTime; } /** @@ -860,12 +776,10 @@ public class LitemallOrder { sb.append(", orderPrice=").append(orderPrice); sb.append(", actualPrice=").append(actualPrice); sb.append(", payId=").append(payId); - sb.append(", payStatus=").append(payStatus); sb.append(", payTime=").append(payTime); sb.append(", shipSn=").append(shipSn); sb.append(", shipChannel=").append(shipChannel); - sb.append(", shipStartTime=").append(shipStartTime); - sb.append(", shipEndTime=").append(shipEndTime); + sb.append(", shipTime=").append(shipTime); sb.append(", confirmTime=").append(confirmTime); sb.append(", endTime=").append(endTime); sb.append(", addTime=").append(addTime); @@ -906,12 +820,10 @@ public class LitemallOrder { && (this.getOrderPrice() == null ? other.getOrderPrice() == null : this.getOrderPrice().equals(other.getOrderPrice())) && (this.getActualPrice() == null ? other.getActualPrice() == null : this.getActualPrice().equals(other.getActualPrice())) && (this.getPayId() == null ? other.getPayId() == null : this.getPayId().equals(other.getPayId())) - && (this.getPayStatus() == null ? other.getPayStatus() == null : this.getPayStatus().equals(other.getPayStatus())) && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getShipSn() == null ? other.getShipSn() == null : this.getShipSn().equals(other.getShipSn())) && (this.getShipChannel() == null ? other.getShipChannel() == null : this.getShipChannel().equals(other.getShipChannel())) - && (this.getShipStartTime() == null ? other.getShipStartTime() == null : this.getShipStartTime().equals(other.getShipStartTime())) - && (this.getShipEndTime() == null ? other.getShipEndTime() == null : this.getShipEndTime().equals(other.getShipEndTime())) + && (this.getShipTime() == null ? other.getShipTime() == null : this.getShipTime().equals(other.getShipTime())) && (this.getConfirmTime() == null ? other.getConfirmTime() == null : this.getConfirmTime().equals(other.getConfirmTime())) && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) @@ -942,12 +854,10 @@ public class LitemallOrder { result = prime * result + ((getOrderPrice() == null) ? 0 : getOrderPrice().hashCode()); result = prime * result + ((getActualPrice() == null) ? 0 : getActualPrice().hashCode()); result = prime * result + ((getPayId() == null) ? 0 : getPayId().hashCode()); - result = prime * result + ((getPayStatus() == null) ? 0 : getPayStatus().hashCode()); result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getShipSn() == null) ? 0 : getShipSn().hashCode()); result = prime * result + ((getShipChannel() == null) ? 0 : getShipChannel().hashCode()); - result = prime * result + ((getShipStartTime() == null) ? 0 : getShipStartTime().hashCode()); - result = prime * result + ((getShipEndTime() == null) ? 0 : getShipEndTime().hashCode()); + result = prime * result + ((getShipTime() == null) ? 0 : getShipTime().hashCode()); result = prime * result + ((getConfirmTime() == null) ? 0 : getConfirmTime().hashCode()); result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); @@ -988,12 +898,10 @@ public class LitemallOrder { orderPrice("order_price", "orderPrice", "DECIMAL"), actualPrice("actual_price", "actualPrice", "DECIMAL"), payId("pay_id", "payId", "VARCHAR"), - payStatus("pay_status", "payStatus", "SMALLINT"), payTime("pay_time", "payTime", "TIMESTAMP"), shipSn("ship_sn", "shipSn", "VARCHAR"), shipChannel("ship_channel", "shipChannel", "VARCHAR"), - shipStartTime("ship_start_time", "shipStartTime", "TIMESTAMP"), - shipEndTime("ship_end_time", "shipEndTime", "TIMESTAMP"), + shipTime("ship_time", "shipTime", "TIMESTAMP"), confirmTime("confirm_time", "confirmTime", "TIMESTAMP"), endTime("end_time", "endTime", "TIMESTAMP"), addTime("add_time", "addTime", "TIMESTAMP"), @@ -1104,5 +1012,20 @@ public class LitemallOrder { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file 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 4c645a92..d930d70a 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 @@ -1117,66 +1117,6 @@ public class LitemallOrderExample { return (Criteria) this; } - public Criteria andPayStatusIsNull() { - addCriterion("pay_status is null"); - return (Criteria) this; - } - - public Criteria andPayStatusIsNotNull() { - addCriterion("pay_status is not null"); - return (Criteria) this; - } - - public Criteria andPayStatusEqualTo(Short value) { - addCriterion("pay_status =", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotEqualTo(Short value) { - addCriterion("pay_status <>", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThan(Short value) { - addCriterion("pay_status >", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusGreaterThanOrEqualTo(Short value) { - addCriterion("pay_status >=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThan(Short value) { - addCriterion("pay_status <", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusLessThanOrEqualTo(Short value) { - addCriterion("pay_status <=", value, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusIn(List values) { - addCriterion("pay_status in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotIn(List values) { - addCriterion("pay_status not in", values, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusBetween(Short value1, Short value2) { - addCriterion("pay_status between", value1, value2, "payStatus"); - return (Criteria) this; - } - - public Criteria andPayStatusNotBetween(Short value1, Short value2) { - addCriterion("pay_status not between", value1, value2, "payStatus"); - return (Criteria) this; - } - public Criteria andPayTimeIsNull() { addCriterion("pay_time is null"); return (Criteria) this; @@ -1377,123 +1317,63 @@ public class LitemallOrderExample { return (Criteria) this; } - public Criteria andShipStartTimeIsNull() { - addCriterion("ship_start_time is null"); + public Criteria andShipTimeIsNull() { + addCriterion("ship_time is null"); return (Criteria) this; } - public Criteria andShipStartTimeIsNotNull() { - addCriterion("ship_start_time is not null"); + public Criteria andShipTimeIsNotNull() { + addCriterion("ship_time is not null"); return (Criteria) this; } - public Criteria andShipStartTimeEqualTo(LocalDateTime value) { - addCriterion("ship_start_time =", value, "shipStartTime"); + public Criteria andShipTimeEqualTo(LocalDateTime value) { + addCriterion("ship_time =", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeNotEqualTo(LocalDateTime value) { - addCriterion("ship_start_time <>", value, "shipStartTime"); + public Criteria andShipTimeNotEqualTo(LocalDateTime value) { + addCriterion("ship_time <>", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeGreaterThan(LocalDateTime value) { - addCriterion("ship_start_time >", value, "shipStartTime"); + public Criteria andShipTimeGreaterThan(LocalDateTime value) { + addCriterion("ship_time >", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("ship_start_time >=", value, "shipStartTime"); + public Criteria andShipTimeGreaterThanOrEqualTo(LocalDateTime value) { + addCriterion("ship_time >=", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeLessThan(LocalDateTime value) { - addCriterion("ship_start_time <", value, "shipStartTime"); + public Criteria andShipTimeLessThan(LocalDateTime value) { + addCriterion("ship_time <", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("ship_start_time <=", value, "shipStartTime"); + public Criteria andShipTimeLessThanOrEqualTo(LocalDateTime value) { + addCriterion("ship_time <=", value, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeIn(List values) { - addCriterion("ship_start_time in", values, "shipStartTime"); + public Criteria andShipTimeIn(List values) { + addCriterion("ship_time in", values, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeNotIn(List values) { - addCriterion("ship_start_time not in", values, "shipStartTime"); + public Criteria andShipTimeNotIn(List values) { + addCriterion("ship_time not in", values, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("ship_start_time between", value1, value2, "shipStartTime"); + public Criteria andShipTimeBetween(LocalDateTime value1, LocalDateTime value2) { + addCriterion("ship_time between", value1, value2, "shipTime"); return (Criteria) this; } - public Criteria andShipStartTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("ship_start_time not between", value1, value2, "shipStartTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeIsNull() { - addCriterion("ship_end_time is null"); - return (Criteria) this; - } - - public Criteria andShipEndTimeIsNotNull() { - addCriterion("ship_end_time is not null"); - return (Criteria) this; - } - - public Criteria andShipEndTimeEqualTo(LocalDateTime value) { - addCriterion("ship_end_time =", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeNotEqualTo(LocalDateTime value) { - addCriterion("ship_end_time <>", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeGreaterThan(LocalDateTime value) { - addCriterion("ship_end_time >", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("ship_end_time >=", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeLessThan(LocalDateTime value) { - addCriterion("ship_end_time <", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("ship_end_time <=", value, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeIn(List values) { - addCriterion("ship_end_time in", values, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeNotIn(List values) { - addCriterion("ship_end_time not in", values, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("ship_end_time between", value1, value2, "shipEndTime"); - return (Criteria) this; - } - - public Criteria andShipEndTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("ship_end_time not between", value1, value2, "shipEndTime"); + public Criteria andShipTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { + addCriterion("ship_time not between", value1, value2, "shipTime"); return (Criteria) this; } @@ -1802,18 +1682,6 @@ public class LitemallOrderExample { return deleted ? andDeletedEqualTo(LitemallOrder.IS_DELETED) : andDeletedNotEqualTo(LitemallOrder.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_order - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallOrder.IS_DELETED) : andDeletedNotEqualTo(LitemallOrder.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_order diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoods.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoods.java index 9b2ecf9f..1a0e597c 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoods.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoods.java @@ -2,6 +2,7 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; public class LitemallOrderGoods { @@ -14,16 +15,6 @@ public class LitemallOrderGoods { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_order_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_order_goods @@ -33,16 +24,6 @@ public class LitemallOrderGoods { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_order_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -109,29 +90,20 @@ public class LitemallOrderGoods { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order_goods.retail_price + * This field corresponds to the database column litemall_order_goods.price * * @mbg.generated */ - private BigDecimal retailPrice; + private BigDecimal price; /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order_goods.goods_specification_values + * This field corresponds to the database column litemall_order_goods.specifications * * @mbg.generated */ - private String goodsSpecificationValues; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_order_goods.goods_specification_ids - * - * @mbg.generated - */ - private Integer[] goodsSpecificationIds; + private String[] specifications; /** * @@ -330,74 +302,50 @@ public class LitemallOrderGoods { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order_goods.retail_price + * This method returns the value of the database column litemall_order_goods.price * - * @return the value of litemall_order_goods.retail_price + * @return the value of litemall_order_goods.price * * @mbg.generated */ - public BigDecimal getRetailPrice() { - return retailPrice; + public BigDecimal getPrice() { + return price; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order_goods.retail_price + * This method sets the value of the database column litemall_order_goods.price * - * @param retailPrice the value for litemall_order_goods.retail_price + * @param price the value for litemall_order_goods.price * * @mbg.generated */ - public void setRetailPrice(BigDecimal retailPrice) { - this.retailPrice = retailPrice; + public void setPrice(BigDecimal price) { + this.price = price; } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order_goods.goods_specification_values + * This method returns the value of the database column litemall_order_goods.specifications * - * @return the value of litemall_order_goods.goods_specification_values + * @return the value of litemall_order_goods.specifications * * @mbg.generated */ - public String getGoodsSpecificationValues() { - return goodsSpecificationValues; + public String[] getSpecifications() { + return specifications; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order_goods.goods_specification_values + * This method sets the value of the database column litemall_order_goods.specifications * - * @param goodsSpecificationValues the value for litemall_order_goods.goods_specification_values + * @param specifications the value for litemall_order_goods.specifications * * @mbg.generated */ - public void setGoodsSpecificationValues(String goodsSpecificationValues) { - this.goodsSpecificationValues = goodsSpecificationValues; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_order_goods.goods_specification_ids - * - * @return the value of litemall_order_goods.goods_specification_ids - * - * @mbg.generated - */ - public Integer[] getGoodsSpecificationIds() { - return goodsSpecificationIds; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_order_goods.goods_specification_ids - * - * @param goodsSpecificationIds the value for litemall_order_goods.goods_specification_ids - * - * @mbg.generated - */ - public void setGoodsSpecificationIds(Integer[] goodsSpecificationIds) { - this.goodsSpecificationIds = goodsSpecificationIds; + public void setSpecifications(String[] specifications) { + this.specifications = specifications; } /** @@ -491,9 +439,8 @@ public class LitemallOrderGoods { sb.append(", goodsSn=").append(goodsSn); sb.append(", productId=").append(productId); sb.append(", number=").append(number); - sb.append(", retailPrice=").append(retailPrice); - sb.append(", goodsSpecificationValues=").append(goodsSpecificationValues); - sb.append(", goodsSpecificationIds=").append(goodsSpecificationIds); + sb.append(", price=").append(price); + sb.append(", specifications=").append(specifications); sb.append(", picUrl=").append(picUrl); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); @@ -526,9 +473,8 @@ public class LitemallOrderGoods { && (this.getGoodsSn() == null ? other.getGoodsSn() == null : this.getGoodsSn().equals(other.getGoodsSn())) && (this.getProductId() == null ? other.getProductId() == null : this.getProductId().equals(other.getProductId())) && (this.getNumber() == null ? other.getNumber() == null : this.getNumber().equals(other.getNumber())) - && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice())) - && (this.getGoodsSpecificationValues() == null ? other.getGoodsSpecificationValues() == null : this.getGoodsSpecificationValues().equals(other.getGoodsSpecificationValues())) - && (Arrays.equals(this.getGoodsSpecificationIds(), other.getGoodsSpecificationIds())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (Arrays.equals(this.getSpecifications(), other.getSpecifications())) && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); @@ -551,9 +497,8 @@ public class LitemallOrderGoods { result = prime * result + ((getGoodsSn() == null) ? 0 : getGoodsSn().hashCode()); result = prime * result + ((getProductId() == null) ? 0 : getProductId().hashCode()); result = prime * result + ((getNumber() == null) ? 0 : getNumber().hashCode()); - result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode()); - result = prime * result + ((getGoodsSpecificationValues() == null) ? 0 : getGoodsSpecificationValues().hashCode()); - result = prime * result + (Arrays.hashCode(getGoodsSpecificationIds())); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + (Arrays.hashCode(getSpecifications())); result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); @@ -586,9 +531,8 @@ public class LitemallOrderGoods { goodsSn("goods_sn", "goodsSn", "VARCHAR"), productId("product_id", "productId", "INTEGER"), number("number", "number", "SMALLINT"), - retailPrice("retail_price", "retailPrice", "DECIMAL"), - goodsSpecificationValues("goods_specification_values", "goodsSpecificationValues", "VARCHAR"), - goodsSpecificationIds("goods_specification_ids", "goodsSpecificationIds", "CHAR"), + price("price", "price", "DECIMAL"), + specifications("specifications", "specifications", "VARCHAR"), picUrl("pic_url", "picUrl", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -698,5 +642,20 @@ public class LitemallOrderGoods { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_order_goods + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoodsExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoodsExample.java index d4d5fd33..4b360738 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoodsExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallOrderGoodsExample.java @@ -187,7 +187,7 @@ public class LitemallOrderGoodsExample { * @mbg.generated */ protected abstract static class GeneratedCriteria { - protected List goodsSpecificationIdsCriteria; + protected List specificationsCriteria; protected List allCriteria; @@ -196,39 +196,39 @@ public class LitemallOrderGoodsExample { protected GeneratedCriteria() { super(); criteria = new ArrayList(); - goodsSpecificationIdsCriteria = new ArrayList(); + specificationsCriteria = new ArrayList(); } - public List getGoodsSpecificationIdsCriteria() { - return goodsSpecificationIdsCriteria; + public List getSpecificationsCriteria() { + return specificationsCriteria; } - protected void addGoodsSpecificationIdsCriterion(String condition, Object value, String property) { + protected void addSpecificationsCriterion(String condition, Object value, String property) { if (value == null) { throw new RuntimeException("Value for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } - protected void addGoodsSpecificationIdsCriterion(String condition, Integer[] value1, Integer[] value2, String property) { + protected void addSpecificationsCriterion(String condition, String[] value1, String[] value2, String property) { if (value1 == null || value2 == null) { throw new RuntimeException("Between values for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } public boolean isValid() { return criteria.size() > 0 - || goodsSpecificationIdsCriteria.size() > 0; + || specificationsCriteria.size() > 0; } public List getAllCriteria() { if (allCriteria == null) { allCriteria = new ArrayList(); allCriteria.addAll(criteria); - allCriteria.addAll(goodsSpecificationIdsCriteria); + allCriteria.addAll(specificationsCriteria); } return allCriteria; } @@ -701,203 +701,133 @@ public class LitemallOrderGoodsExample { return (Criteria) this; } - public Criteria andRetailPriceIsNull() { - addCriterion("retail_price is null"); + public Criteria andPriceIsNull() { + addCriterion("price is null"); return (Criteria) this; } - public Criteria andRetailPriceIsNotNull() { - addCriterion("retail_price is not null"); + public Criteria andPriceIsNotNull() { + addCriterion("price is not null"); return (Criteria) this; } - public Criteria andRetailPriceEqualTo(BigDecimal value) { - addCriterion("retail_price =", value, "retailPrice"); + public Criteria andPriceEqualTo(BigDecimal value) { + addCriterion("price =", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceNotEqualTo(BigDecimal value) { - addCriterion("retail_price <>", value, "retailPrice"); + public Criteria andPriceNotEqualTo(BigDecimal value) { + addCriterion("price <>", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThan(BigDecimal value) { - addCriterion("retail_price >", value, "retailPrice"); + public Criteria andPriceGreaterThan(BigDecimal value) { + addCriterion("price >", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price >=", value, "retailPrice"); + public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price >=", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceLessThan(BigDecimal value) { - addCriterion("retail_price <", value, "retailPrice"); + public Criteria andPriceLessThan(BigDecimal value) { + addCriterion("price <", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price <=", value, "retailPrice"); + public Criteria andPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("price <=", value, "price"); return (Criteria) this; } - public Criteria andRetailPriceIn(List values) { - addCriterion("retail_price in", values, "retailPrice"); + public Criteria andPriceIn(List values) { + addCriterion("price in", values, "price"); return (Criteria) this; } - public Criteria andRetailPriceNotIn(List values) { - addCriterion("retail_price not in", values, "retailPrice"); + public Criteria andPriceNotIn(List values) { + addCriterion("price not in", values, "price"); return (Criteria) this; } - public Criteria andRetailPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price between", value1, value2, "retailPrice"); + public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price between", value1, value2, "price"); return (Criteria) this; } - public Criteria andRetailPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price not between", value1, value2, "retailPrice"); + public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price not between", value1, value2, "price"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIsNull() { - addCriterion("goods_specification_values is null"); + public Criteria andSpecificationsIsNull() { + addCriterion("specifications is null"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIsNotNull() { - addCriterion("goods_specification_values is not null"); + public Criteria andSpecificationsIsNotNull() { + addCriterion("specifications is not null"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesEqualTo(String value) { - addCriterion("goods_specification_values =", value, "goodsSpecificationValues"); + public Criteria andSpecificationsEqualTo(String[] value) { + addSpecificationsCriterion("specifications =", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotEqualTo(String value) { - addCriterion("goods_specification_values <>", value, "goodsSpecificationValues"); + public Criteria andSpecificationsNotEqualTo(String[] value) { + addSpecificationsCriterion("specifications <>", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesGreaterThan(String value) { - addCriterion("goods_specification_values >", value, "goodsSpecificationValues"); + public Criteria andSpecificationsGreaterThan(String[] value) { + addSpecificationsCriterion("specifications >", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesGreaterThanOrEqualTo(String value) { - addCriterion("goods_specification_values >=", value, "goodsSpecificationValues"); + public Criteria andSpecificationsGreaterThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications >=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLessThan(String value) { - addCriterion("goods_specification_values <", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLessThan(String[] value) { + addSpecificationsCriterion("specifications <", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLessThanOrEqualTo(String value) { - addCriterion("goods_specification_values <=", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLessThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications <=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesLike(String value) { - addCriterion("goods_specification_values like", value, "goodsSpecificationValues"); + public Criteria andSpecificationsLike(String[] value) { + addSpecificationsCriterion("specifications like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotLike(String value) { - addCriterion("goods_specification_values not like", value, "goodsSpecificationValues"); + public Criteria andSpecificationsNotLike(String[] value) { + addSpecificationsCriterion("specifications not like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesIn(List values) { - addCriterion("goods_specification_values in", values, "goodsSpecificationValues"); + public Criteria andSpecificationsIn(List values) { + addSpecificationsCriterion("specifications in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotIn(List values) { - addCriterion("goods_specification_values not in", values, "goodsSpecificationValues"); + public Criteria andSpecificationsNotIn(List values) { + addSpecificationsCriterion("specifications not in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesBetween(String value1, String value2) { - addCriterion("goods_specification_values between", value1, value2, "goodsSpecificationValues"); + public Criteria andSpecificationsBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications between", value1, value2, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationValuesNotBetween(String value1, String value2) { - addCriterion("goods_specification_values not between", value1, value2, "goodsSpecificationValues"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIsNull() { - addCriterion("goods_specification_ids is null"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIsNotNull() { - addCriterion("goods_specification_ids is not null"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids =", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <>", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsGreaterThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsGreaterThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >=", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLessThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLessThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <=", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids like", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not like", value, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids in", values, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not in", values, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids between", value1, value2, "goodsSpecificationIds"); - return (Criteria) this; - } - - public Criteria andGoodsSpecificationIdsNotBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not between", value1, value2, "goodsSpecificationIds"); + public Criteria andSpecificationsNotBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications not between", value1, value2, "specifications"); return (Criteria) this; } @@ -1156,18 +1086,6 @@ public class LitemallOrderGoodsExample { return deleted ? andDeletedEqualTo(LitemallOrderGoods.IS_DELETED) : andDeletedNotEqualTo(LitemallOrderGoods.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_order_goods - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallOrderGoods.IS_DELETED) : andDeletedNotEqualTo(LitemallOrderGoods.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_order_goods diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProduct.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProduct.java index 6761222d..be6c7177 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProduct.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProduct.java @@ -2,6 +2,7 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.Arrays; public class LitemallProduct { @@ -14,16 +15,6 @@ public class LitemallProduct { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_product - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_product @@ -33,16 +24,6 @@ public class LitemallProduct { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_product - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -64,29 +45,29 @@ public class LitemallProduct { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_product.goods_specification_ids + * This field corresponds to the database column litemall_product.specifications * * @mbg.generated */ - private Integer[] goodsSpecificationIds; + private String[] specifications; /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_product.goods_number + * This field corresponds to the database column litemall_product.price * * @mbg.generated */ - private Integer goodsNumber; + private BigDecimal price; /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_product.retail_price + * This field corresponds to the database column litemall_product.number * * @mbg.generated */ - private BigDecimal retailPrice; + private Integer number; /** * @@ -165,74 +146,74 @@ public class LitemallProduct { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_product.goods_specification_ids + * This method returns the value of the database column litemall_product.specifications * - * @return the value of litemall_product.goods_specification_ids + * @return the value of litemall_product.specifications * * @mbg.generated */ - public Integer[] getGoodsSpecificationIds() { - return goodsSpecificationIds; + public String[] getSpecifications() { + return specifications; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_product.goods_specification_ids + * This method sets the value of the database column litemall_product.specifications * - * @param goodsSpecificationIds the value for litemall_product.goods_specification_ids + * @param specifications the value for litemall_product.specifications * * @mbg.generated */ - public void setGoodsSpecificationIds(Integer[] goodsSpecificationIds) { - this.goodsSpecificationIds = goodsSpecificationIds; + public void setSpecifications(String[] specifications) { + this.specifications = specifications; } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_product.goods_number + * This method returns the value of the database column litemall_product.price * - * @return the value of litemall_product.goods_number + * @return the value of litemall_product.price * * @mbg.generated */ - public Integer getGoodsNumber() { - return goodsNumber; + public BigDecimal getPrice() { + return price; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_product.goods_number + * This method sets the value of the database column litemall_product.price * - * @param goodsNumber the value for litemall_product.goods_number + * @param price the value for litemall_product.price * * @mbg.generated */ - public void setGoodsNumber(Integer goodsNumber) { - this.goodsNumber = goodsNumber; + public void setPrice(BigDecimal price) { + this.price = price; } /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_product.retail_price + * This method returns the value of the database column litemall_product.number * - * @return the value of litemall_product.retail_price + * @return the value of litemall_product.number * * @mbg.generated */ - public BigDecimal getRetailPrice() { - return retailPrice; + public Integer getNumber() { + return number; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_product.retail_price + * This method sets the value of the database column litemall_product.number * - * @param retailPrice the value for litemall_product.retail_price + * @param number the value for litemall_product.number * * @mbg.generated */ - public void setRetailPrice(BigDecimal retailPrice) { - this.retailPrice = retailPrice; + public void setNumber(Integer number) { + this.number = number; } /** @@ -321,9 +302,9 @@ public class LitemallProduct { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", goodsId=").append(goodsId); - sb.append(", goodsSpecificationIds=").append(goodsSpecificationIds); - sb.append(", goodsNumber=").append(goodsNumber); - sb.append(", retailPrice=").append(retailPrice); + sb.append(", specifications=").append(specifications); + sb.append(", price=").append(price); + sb.append(", number=").append(number); sb.append(", url=").append(url); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); @@ -351,9 +332,9 @@ public class LitemallProduct { LitemallProduct other = (LitemallProduct) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId())) - && (Arrays.equals(this.getGoodsSpecificationIds(), other.getGoodsSpecificationIds())) - && (this.getGoodsNumber() == null ? other.getGoodsNumber() == null : this.getGoodsNumber().equals(other.getGoodsNumber())) - && (this.getRetailPrice() == null ? other.getRetailPrice() == null : this.getRetailPrice().equals(other.getRetailPrice())) + && (Arrays.equals(this.getSpecifications(), other.getSpecifications())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) + && (this.getNumber() == null ? other.getNumber() == null : this.getNumber().equals(other.getNumber())) && (this.getUrl() == null ? other.getUrl() == null : this.getUrl().equals(other.getUrl())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); @@ -371,9 +352,9 @@ public class LitemallProduct { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode()); - result = prime * result + (Arrays.hashCode(getGoodsSpecificationIds())); - result = prime * result + ((getGoodsNumber() == null) ? 0 : getGoodsNumber().hashCode()); - result = prime * result + ((getRetailPrice() == null) ? 0 : getRetailPrice().hashCode()); + result = prime * result + (Arrays.hashCode(getSpecifications())); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); + result = prime * result + ((getNumber() == null) ? 0 : getNumber().hashCode()); result = prime * result + ((getUrl() == null) ? 0 : getUrl().hashCode()); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); @@ -401,9 +382,9 @@ public class LitemallProduct { public enum Column { id("id", "id", "INTEGER"), goodsId("goods_id", "goodsId", "INTEGER"), - goodsSpecificationIds("goods_specification_ids", "goodsSpecificationIds", "CHAR"), - goodsNumber("goods_number", "goodsNumber", "INTEGER"), - retailPrice("retail_price", "retailPrice", "DECIMAL"), + specifications("specifications", "specifications", "VARCHAR"), + price("price", "price", "DECIMAL"), + number("number", "number", "INTEGER"), url("url", "url", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -513,5 +494,20 @@ public class LitemallProduct { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_product + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProductExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProductExample.java index 6af871d8..3577ba4b 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProductExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallProductExample.java @@ -187,7 +187,7 @@ public class LitemallProductExample { * @mbg.generated */ protected abstract static class GeneratedCriteria { - protected List goodsSpecificationIdsCriteria; + protected List specificationsCriteria; protected List allCriteria; @@ -196,39 +196,39 @@ public class LitemallProductExample { protected GeneratedCriteria() { super(); criteria = new ArrayList(); - goodsSpecificationIdsCriteria = new ArrayList(); + specificationsCriteria = new ArrayList(); } - public List getGoodsSpecificationIdsCriteria() { - return goodsSpecificationIdsCriteria; + public List getSpecificationsCriteria() { + return specificationsCriteria; } - protected void addGoodsSpecificationIdsCriterion(String condition, Object value, String property) { + protected void addSpecificationsCriterion(String condition, Object value, String property) { if (value == null) { throw new RuntimeException("Value for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } - protected void addGoodsSpecificationIdsCriterion(String condition, Integer[] value1, Integer[] value2, String property) { + protected void addSpecificationsCriterion(String condition, String[] value1, String[] value2, String property) { if (value1 == null || value2 == null) { throw new RuntimeException("Between values for " + property + " cannot be null"); } - goodsSpecificationIdsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + specificationsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler")); allCriteria = null; } public boolean isValid() { return criteria.size() > 0 - || goodsSpecificationIdsCriteria.size() > 0; + || specificationsCriteria.size() > 0; } public List getAllCriteria() { if (allCriteria == null) { allCriteria = new ArrayList(); allCriteria.addAll(criteria); - allCriteria.addAll(goodsSpecificationIdsCriteria); + allCriteria.addAll(specificationsCriteria); } return allCriteria; } @@ -381,193 +381,193 @@ public class LitemallProductExample { return (Criteria) this; } - public Criteria andGoodsSpecificationIdsIsNull() { - addCriterion("goods_specification_ids is null"); + public Criteria andSpecificationsIsNull() { + addCriterion("specifications is null"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsIsNotNull() { - addCriterion("goods_specification_ids is not null"); + public Criteria andSpecificationsIsNotNull() { + addCriterion("specifications is not null"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids =", value, "goodsSpecificationIds"); + public Criteria andSpecificationsEqualTo(String[] value) { + addSpecificationsCriterion("specifications =", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsNotEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <>", value, "goodsSpecificationIds"); + public Criteria andSpecificationsNotEqualTo(String[] value) { + addSpecificationsCriterion("specifications <>", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsGreaterThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >", value, "goodsSpecificationIds"); + public Criteria andSpecificationsGreaterThan(String[] value) { + addSpecificationsCriterion("specifications >", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsGreaterThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids >=", value, "goodsSpecificationIds"); + public Criteria andSpecificationsGreaterThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications >=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsLessThan(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <", value, "goodsSpecificationIds"); + public Criteria andSpecificationsLessThan(String[] value) { + addSpecificationsCriterion("specifications <", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsLessThanOrEqualTo(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids <=", value, "goodsSpecificationIds"); + public Criteria andSpecificationsLessThanOrEqualTo(String[] value) { + addSpecificationsCriterion("specifications <=", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids like", value, "goodsSpecificationIds"); + public Criteria andSpecificationsLike(String[] value) { + addSpecificationsCriterion("specifications like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsNotLike(Integer[] value) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not like", value, "goodsSpecificationIds"); + public Criteria andSpecificationsNotLike(String[] value) { + addSpecificationsCriterion("specifications not like", value, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids in", values, "goodsSpecificationIds"); + public Criteria andSpecificationsIn(List values) { + addSpecificationsCriterion("specifications in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsNotIn(List values) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not in", values, "goodsSpecificationIds"); + public Criteria andSpecificationsNotIn(List values) { + addSpecificationsCriterion("specifications not in", values, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids between", value1, value2, "goodsSpecificationIds"); + public Criteria andSpecificationsBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications between", value1, value2, "specifications"); return (Criteria) this; } - public Criteria andGoodsSpecificationIdsNotBetween(Integer[] value1, Integer[] value2) { - addGoodsSpecificationIdsCriterion("goods_specification_ids not between", value1, value2, "goodsSpecificationIds"); + public Criteria andSpecificationsNotBetween(String[] value1, String[] value2) { + addSpecificationsCriterion("specifications not between", value1, value2, "specifications"); return (Criteria) this; } - public Criteria andGoodsNumberIsNull() { - addCriterion("goods_number is null"); + public Criteria andPriceIsNull() { + addCriterion("price is null"); return (Criteria) this; } - public Criteria andGoodsNumberIsNotNull() { - addCriterion("goods_number is not null"); + public Criteria andPriceIsNotNull() { + addCriterion("price is not null"); return (Criteria) this; } - public Criteria andGoodsNumberEqualTo(Integer value) { - addCriterion("goods_number =", value, "goodsNumber"); + public Criteria andPriceEqualTo(BigDecimal value) { + addCriterion("price =", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberNotEqualTo(Integer value) { - addCriterion("goods_number <>", value, "goodsNumber"); + public Criteria andPriceNotEqualTo(BigDecimal value) { + addCriterion("price <>", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberGreaterThan(Integer value) { - addCriterion("goods_number >", value, "goodsNumber"); + public Criteria andPriceGreaterThan(BigDecimal value) { + addCriterion("price >", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberGreaterThanOrEqualTo(Integer value) { - addCriterion("goods_number >=", value, "goodsNumber"); + public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price >=", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberLessThan(Integer value) { - addCriterion("goods_number <", value, "goodsNumber"); + public Criteria andPriceLessThan(BigDecimal value) { + addCriterion("price <", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberLessThanOrEqualTo(Integer value) { - addCriterion("goods_number <=", value, "goodsNumber"); + public Criteria andPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("price <=", value, "price"); return (Criteria) this; } - public Criteria andGoodsNumberIn(List values) { - addCriterion("goods_number in", values, "goodsNumber"); + public Criteria andPriceIn(List values) { + addCriterion("price in", values, "price"); return (Criteria) this; } - public Criteria andGoodsNumberNotIn(List values) { - addCriterion("goods_number not in", values, "goodsNumber"); + public Criteria andPriceNotIn(List values) { + addCriterion("price not in", values, "price"); return (Criteria) this; } - public Criteria andGoodsNumberBetween(Integer value1, Integer value2) { - addCriterion("goods_number between", value1, value2, "goodsNumber"); + public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price between", value1, value2, "price"); return (Criteria) this; } - public Criteria andGoodsNumberNotBetween(Integer value1, Integer value2) { - addCriterion("goods_number not between", value1, value2, "goodsNumber"); + public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price not between", value1, value2, "price"); return (Criteria) this; } - public Criteria andRetailPriceIsNull() { - addCriterion("retail_price is null"); + public Criteria andNumberIsNull() { + addCriterion("`number` is null"); return (Criteria) this; } - public Criteria andRetailPriceIsNotNull() { - addCriterion("retail_price is not null"); + public Criteria andNumberIsNotNull() { + addCriterion("`number` is not null"); return (Criteria) this; } - public Criteria andRetailPriceEqualTo(BigDecimal value) { - addCriterion("retail_price =", value, "retailPrice"); + public Criteria andNumberEqualTo(Integer value) { + addCriterion("`number` =", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceNotEqualTo(BigDecimal value) { - addCriterion("retail_price <>", value, "retailPrice"); + public Criteria andNumberNotEqualTo(Integer value) { + addCriterion("`number` <>", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThan(BigDecimal value) { - addCriterion("retail_price >", value, "retailPrice"); + public Criteria andNumberGreaterThan(Integer value) { + addCriterion("`number` >", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price >=", value, "retailPrice"); + public Criteria andNumberGreaterThanOrEqualTo(Integer value) { + addCriterion("`number` >=", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceLessThan(BigDecimal value) { - addCriterion("retail_price <", value, "retailPrice"); + public Criteria andNumberLessThan(Integer value) { + addCriterion("`number` <", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceLessThanOrEqualTo(BigDecimal value) { - addCriterion("retail_price <=", value, "retailPrice"); + public Criteria andNumberLessThanOrEqualTo(Integer value) { + addCriterion("`number` <=", value, "number"); return (Criteria) this; } - public Criteria andRetailPriceIn(List values) { - addCriterion("retail_price in", values, "retailPrice"); + public Criteria andNumberIn(List values) { + addCriterion("`number` in", values, "number"); return (Criteria) this; } - public Criteria andRetailPriceNotIn(List values) { - addCriterion("retail_price not in", values, "retailPrice"); + public Criteria andNumberNotIn(List values) { + addCriterion("`number` not in", values, "number"); return (Criteria) this; } - public Criteria andRetailPriceBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price between", value1, value2, "retailPrice"); + public Criteria andNumberBetween(Integer value1, Integer value2) { + addCriterion("`number` between", value1, value2, "number"); return (Criteria) this; } - public Criteria andRetailPriceNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("retail_price not between", value1, value2, "retailPrice"); + public Criteria andNumberNotBetween(Integer value1, Integer value2) { + addCriterion("`number` not between", value1, value2, "number"); return (Criteria) this; } @@ -826,18 +826,6 @@ public class LitemallProductExample { return deleted ? andDeletedEqualTo(LitemallProduct.IS_DELETED) : andDeletedNotEqualTo(LitemallProduct.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_product - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallProduct.IS_DELETED) : andDeletedNotEqualTo(LitemallProduct.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_product diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java index e6010ac4..75fbe704 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallRegion.java @@ -1,5 +1,8 @@ package org.linlinjava.litemall.db.domain; +import java.util.ArrayList; +import java.util.Arrays; + public class LitemallRegion { /** * @@ -349,5 +352,20 @@ public class LitemallRegion { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_region + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java index 59343d29..59f791c2 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistory.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallSearchHistory { /** @@ -12,16 +14,6 @@ public class LitemallSearchHistory { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_search_history - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_search_history @@ -31,16 +23,6 @@ public class LitemallSearchHistory { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_search_history - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -327,7 +309,7 @@ public class LitemallSearchHistory { public enum Column { id("id", "id", "INTEGER"), userId("user_id", "userId", "INTEGER"), - keyword("keyword", "keyword", "CHAR"), + keyword("keyword", "keyword", "VARCHAR"), from("from", "from", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -437,5 +419,20 @@ public class LitemallSearchHistory { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_search_history + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java index 297379d7..c8cb0aee 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallSearchHistoryExample.java @@ -671,18 +671,6 @@ public class LitemallSearchHistoryExample { return deleted ? andDeletedEqualTo(LitemallSearchHistory.IS_DELETED) : andDeletedNotEqualTo(LitemallSearchHistory.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_search_history - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallSearchHistory.IS_DELETED) : andDeletedNotEqualTo(LitemallSearchHistory.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_search_history diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java index 3fa3c9ed..6b2ccc91 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java @@ -1,6 +1,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallStorage { /** @@ -12,16 +14,6 @@ public class LitemallStorage { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_storage - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_storage @@ -31,16 +23,6 @@ public class LitemallStorage { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_storage - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -548,5 +530,20 @@ public class LitemallStorage { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_storage + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java index 0c2a35f9..18ab9860 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java @@ -871,18 +871,6 @@ public class LitemallStorageExample { return deleted ? andDeletedEqualTo(LitemallStorage.IS_DELETED) : andDeletedNotEqualTo(LitemallStorage.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_storage - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallStorage.IS_DELETED) : andDeletedNotEqualTo(LitemallStorage.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_storage diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java index 69e926d6..9c8e1801 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java @@ -2,6 +2,8 @@ package org.linlinjava.litemall.db.domain; import java.math.BigDecimal; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallTopic { /** @@ -13,16 +15,6 @@ public class LitemallTopic { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_topic - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_topic @@ -32,16 +24,6 @@ public class LitemallTopic { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_topic - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -60,24 +42,6 @@ public class LitemallTopic { */ private String title; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_topic.avatar - * - * @mbg.generated - */ - private String avatar; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_topic.item_pic_url - * - * @mbg.generated - */ - private String itemPicUrl; - /** * * This field was generated by MyBatis Generator. @@ -90,11 +54,11 @@ public class LitemallTopic { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_topic.price_info + * This field corresponds to the database column litemall_topic.price * * @mbg.generated */ - private BigDecimal priceInfo; + private BigDecimal price; /** * @@ -108,11 +72,11 @@ public class LitemallTopic { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_topic.scene_pic_url + * This field corresponds to the database column litemall_topic.pic_url * * @mbg.generated */ - private String scenePicUrl; + private String picUrl; /** * @@ -126,11 +90,11 @@ public class LitemallTopic { /** * * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_topic.is_show + * This field corresponds to the database column litemall_topic.goods * * @mbg.generated */ - private Boolean isShow; + private Integer[] goods; /** * @@ -207,54 +171,6 @@ public class LitemallTopic { this.title = title; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_topic.avatar - * - * @return the value of litemall_topic.avatar - * - * @mbg.generated - */ - public String getAvatar() { - return avatar; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_topic.avatar - * - * @param avatar the value for litemall_topic.avatar - * - * @mbg.generated - */ - public void setAvatar(String avatar) { - this.avatar = avatar; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_topic.item_pic_url - * - * @return the value of litemall_topic.item_pic_url - * - * @mbg.generated - */ - public String getItemPicUrl() { - return itemPicUrl; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_topic.item_pic_url - * - * @param itemPicUrl the value for litemall_topic.item_pic_url - * - * @mbg.generated - */ - public void setItemPicUrl(String itemPicUrl) { - this.itemPicUrl = itemPicUrl; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_topic.subtitle @@ -281,26 +197,26 @@ public class LitemallTopic { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_topic.price_info + * This method returns the value of the database column litemall_topic.price * - * @return the value of litemall_topic.price_info + * @return the value of litemall_topic.price * * @mbg.generated */ - public BigDecimal getPriceInfo() { - return priceInfo; + public BigDecimal getPrice() { + return price; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_topic.price_info + * This method sets the value of the database column litemall_topic.price * - * @param priceInfo the value for litemall_topic.price_info + * @param price the value for litemall_topic.price * * @mbg.generated */ - public void setPriceInfo(BigDecimal priceInfo) { - this.priceInfo = priceInfo; + public void setPrice(BigDecimal price) { + this.price = price; } /** @@ -329,26 +245,26 @@ public class LitemallTopic { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_topic.scene_pic_url + * This method returns the value of the database column litemall_topic.pic_url * - * @return the value of litemall_topic.scene_pic_url + * @return the value of litemall_topic.pic_url * * @mbg.generated */ - public String getScenePicUrl() { - return scenePicUrl; + public String getPicUrl() { + return picUrl; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_topic.scene_pic_url + * This method sets the value of the database column litemall_topic.pic_url * - * @param scenePicUrl the value for litemall_topic.scene_pic_url + * @param picUrl the value for litemall_topic.pic_url * * @mbg.generated */ - public void setScenePicUrl(String scenePicUrl) { - this.scenePicUrl = scenePicUrl; + public void setPicUrl(String picUrl) { + this.picUrl = picUrl; } /** @@ -377,26 +293,26 @@ public class LitemallTopic { /** * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_topic.is_show + * This method returns the value of the database column litemall_topic.goods * - * @return the value of litemall_topic.is_show + * @return the value of litemall_topic.goods * * @mbg.generated */ - public Boolean getIsShow() { - return isShow; + public Integer[] getGoods() { + return goods; } /** * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_topic.is_show + * This method sets the value of the database column litemall_topic.goods * - * @param isShow the value for litemall_topic.is_show + * @param goods the value for litemall_topic.goods * * @mbg.generated */ - public void setIsShow(Boolean isShow) { - this.isShow = isShow; + public void setGoods(Integer[] goods) { + this.goods = goods; } /** @@ -485,14 +401,12 @@ public class LitemallTopic { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", title=").append(title); - sb.append(", avatar=").append(avatar); - sb.append(", itemPicUrl=").append(itemPicUrl); sb.append(", subtitle=").append(subtitle); - sb.append(", priceInfo=").append(priceInfo); + sb.append(", price=").append(price); sb.append(", readCount=").append(readCount); - sb.append(", scenePicUrl=").append(scenePicUrl); + sb.append(", picUrl=").append(picUrl); sb.append(", sortOrder=").append(sortOrder); - sb.append(", isShow=").append(isShow); + sb.append(", goods=").append(goods); sb.append(", addTime=").append(addTime); sb.append(", deleted=").append(deleted); sb.append(", content=").append(content); @@ -520,14 +434,12 @@ public class LitemallTopic { LitemallTopic other = (LitemallTopic) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getTitle() == null ? other.getTitle() == null : this.getTitle().equals(other.getTitle())) - && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar())) - && (this.getItemPicUrl() == null ? other.getItemPicUrl() == null : this.getItemPicUrl().equals(other.getItemPicUrl())) && (this.getSubtitle() == null ? other.getSubtitle() == null : this.getSubtitle().equals(other.getSubtitle())) - && (this.getPriceInfo() == null ? other.getPriceInfo() == null : this.getPriceInfo().equals(other.getPriceInfo())) + && (this.getPrice() == null ? other.getPrice() == null : this.getPrice().equals(other.getPrice())) && (this.getReadCount() == null ? other.getReadCount() == null : this.getReadCount().equals(other.getReadCount())) - && (this.getScenePicUrl() == null ? other.getScenePicUrl() == null : this.getScenePicUrl().equals(other.getScenePicUrl())) + && (this.getPicUrl() == null ? other.getPicUrl() == null : this.getPicUrl().equals(other.getPicUrl())) && (this.getSortOrder() == null ? other.getSortOrder() == null : this.getSortOrder().equals(other.getSortOrder())) - && (this.getIsShow() == null ? other.getIsShow() == null : this.getIsShow().equals(other.getIsShow())) + && (Arrays.equals(this.getGoods(), other.getGoods())) && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())) && (this.getContent() == null ? other.getContent() == null : this.getContent().equals(other.getContent())); @@ -545,14 +457,12 @@ public class LitemallTopic { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getTitle() == null) ? 0 : getTitle().hashCode()); - result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode()); - result = prime * result + ((getItemPicUrl() == null) ? 0 : getItemPicUrl().hashCode()); result = prime * result + ((getSubtitle() == null) ? 0 : getSubtitle().hashCode()); - result = prime * result + ((getPriceInfo() == null) ? 0 : getPriceInfo().hashCode()); + result = prime * result + ((getPrice() == null) ? 0 : getPrice().hashCode()); result = prime * result + ((getReadCount() == null) ? 0 : getReadCount().hashCode()); - result = prime * result + ((getScenePicUrl() == null) ? 0 : getScenePicUrl().hashCode()); + result = prime * result + ((getPicUrl() == null) ? 0 : getPicUrl().hashCode()); result = prime * result + ((getSortOrder() == null) ? 0 : getSortOrder().hashCode()); - result = prime * result + ((getIsShow() == null) ? 0 : getIsShow().hashCode()); + result = prime * result + (Arrays.hashCode(getGoods())); result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); result = prime * result + ((getContent() == null) ? 0 : getContent().hashCode()); @@ -580,14 +490,12 @@ public class LitemallTopic { public enum Column { id("id", "id", "INTEGER"), title("title", "title", "VARCHAR"), - avatar("avatar", "avatar", "VARCHAR"), - itemPicUrl("item_pic_url", "itemPicUrl", "VARCHAR"), subtitle("subtitle", "subtitle", "VARCHAR"), - priceInfo("price_info", "priceInfo", "DECIMAL"), + price("price", "price", "DECIMAL"), readCount("read_count", "readCount", "VARCHAR"), - scenePicUrl("scene_pic_url", "scenePicUrl", "VARCHAR"), + picUrl("pic_url", "picUrl", "VARCHAR"), sortOrder("sort_order", "sortOrder", "INTEGER"), - isShow("is_show", "isShow", "BIT"), + goods("goods", "goods", "VARCHAR"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"), content("content", "content", "LONGVARCHAR"); @@ -697,5 +605,20 @@ public class LitemallTopic { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_topic + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java index ba67d8aa..b3ca8d57 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java @@ -187,19 +187,50 @@ public class LitemallTopicExample { * @mbg.generated */ protected abstract static class GeneratedCriteria { + protected List goodsCriteria; + + protected List allCriteria; + protected List criteria; protected GeneratedCriteria() { super(); criteria = new ArrayList(); + goodsCriteria = new ArrayList(); + } + + public List getGoodsCriteria() { + return goodsCriteria; + } + + protected void addGoodsCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + goodsCriteria.add(new Criterion(condition, value, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + allCriteria = null; + } + + protected void addGoodsCriterion(String condition, Integer[] value1, Integer[] value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + goodsCriteria.add(new Criterion(condition, value1, value2, "org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler")); + allCriteria = null; } public boolean isValid() { - return criteria.size() > 0; + return criteria.size() > 0 + || goodsCriteria.size() > 0; } public List getAllCriteria() { - return criteria; + if (allCriteria == null) { + allCriteria = new ArrayList(); + allCriteria.addAll(criteria); + allCriteria.addAll(goodsCriteria); + } + return allCriteria; } public List getCriteria() { @@ -211,6 +242,7 @@ public class LitemallTopicExample { throw new RuntimeException("Value for condition cannot be null"); } criteria.add(new Criterion(condition)); + allCriteria = null; } protected void addCriterion(String condition, Object value, String property) { @@ -218,6 +250,7 @@ public class LitemallTopicExample { throw new RuntimeException("Value for " + property + " cannot be null"); } criteria.add(new Criterion(condition, value)); + allCriteria = null; } protected void addCriterion(String condition, Object value1, Object value2, String property) { @@ -225,6 +258,7 @@ public class LitemallTopicExample { throw new RuntimeException("Between values for " + property + " cannot be null"); } criteria.add(new Criterion(condition, value1, value2)); + allCriteria = null; } public Criteria andIdIsNull() { @@ -357,146 +391,6 @@ public class LitemallTopicExample { return (Criteria) this; } - public Criteria andAvatarIsNull() { - addCriterion("avatar is null"); - return (Criteria) this; - } - - public Criteria andAvatarIsNotNull() { - addCriterion("avatar is not null"); - return (Criteria) this; - } - - public Criteria andAvatarEqualTo(String value) { - addCriterion("avatar =", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarNotEqualTo(String value) { - addCriterion("avatar <>", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarGreaterThan(String value) { - addCriterion("avatar >", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarGreaterThanOrEqualTo(String value) { - addCriterion("avatar >=", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarLessThan(String value) { - addCriterion("avatar <", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarLessThanOrEqualTo(String value) { - addCriterion("avatar <=", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarLike(String value) { - addCriterion("avatar like", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarNotLike(String value) { - addCriterion("avatar not like", value, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarIn(List values) { - addCriterion("avatar in", values, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarNotIn(List values) { - addCriterion("avatar not in", values, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarBetween(String value1, String value2) { - addCriterion("avatar between", value1, value2, "avatar"); - return (Criteria) this; - } - - public Criteria andAvatarNotBetween(String value1, String value2) { - addCriterion("avatar not between", value1, value2, "avatar"); - return (Criteria) this; - } - - public Criteria andItemPicUrlIsNull() { - addCriterion("item_pic_url is null"); - return (Criteria) this; - } - - public Criteria andItemPicUrlIsNotNull() { - addCriterion("item_pic_url is not null"); - return (Criteria) this; - } - - public Criteria andItemPicUrlEqualTo(String value) { - addCriterion("item_pic_url =", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlNotEqualTo(String value) { - addCriterion("item_pic_url <>", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlGreaterThan(String value) { - addCriterion("item_pic_url >", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlGreaterThanOrEqualTo(String value) { - addCriterion("item_pic_url >=", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlLessThan(String value) { - addCriterion("item_pic_url <", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlLessThanOrEqualTo(String value) { - addCriterion("item_pic_url <=", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlLike(String value) { - addCriterion("item_pic_url like", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlNotLike(String value) { - addCriterion("item_pic_url not like", value, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlIn(List values) { - addCriterion("item_pic_url in", values, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlNotIn(List values) { - addCriterion("item_pic_url not in", values, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlBetween(String value1, String value2) { - addCriterion("item_pic_url between", value1, value2, "itemPicUrl"); - return (Criteria) this; - } - - public Criteria andItemPicUrlNotBetween(String value1, String value2) { - addCriterion("item_pic_url not between", value1, value2, "itemPicUrl"); - return (Criteria) this; - } - public Criteria andSubtitleIsNull() { addCriterion("subtitle is null"); return (Criteria) this; @@ -567,63 +461,63 @@ public class LitemallTopicExample { return (Criteria) this; } - public Criteria andPriceInfoIsNull() { - addCriterion("price_info is null"); + public Criteria andPriceIsNull() { + addCriterion("price is null"); return (Criteria) this; } - public Criteria andPriceInfoIsNotNull() { - addCriterion("price_info is not null"); + public Criteria andPriceIsNotNull() { + addCriterion("price is not null"); return (Criteria) this; } - public Criteria andPriceInfoEqualTo(BigDecimal value) { - addCriterion("price_info =", value, "priceInfo"); + public Criteria andPriceEqualTo(BigDecimal value) { + addCriterion("price =", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoNotEqualTo(BigDecimal value) { - addCriterion("price_info <>", value, "priceInfo"); + public Criteria andPriceNotEqualTo(BigDecimal value) { + addCriterion("price <>", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoGreaterThan(BigDecimal value) { - addCriterion("price_info >", value, "priceInfo"); + public Criteria andPriceGreaterThan(BigDecimal value) { + addCriterion("price >", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoGreaterThanOrEqualTo(BigDecimal value) { - addCriterion("price_info >=", value, "priceInfo"); + public Criteria andPriceGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("price >=", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoLessThan(BigDecimal value) { - addCriterion("price_info <", value, "priceInfo"); + public Criteria andPriceLessThan(BigDecimal value) { + addCriterion("price <", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoLessThanOrEqualTo(BigDecimal value) { - addCriterion("price_info <=", value, "priceInfo"); + public Criteria andPriceLessThanOrEqualTo(BigDecimal value) { + addCriterion("price <=", value, "price"); return (Criteria) this; } - public Criteria andPriceInfoIn(List values) { - addCriterion("price_info in", values, "priceInfo"); + public Criteria andPriceIn(List values) { + addCriterion("price in", values, "price"); return (Criteria) this; } - public Criteria andPriceInfoNotIn(List values) { - addCriterion("price_info not in", values, "priceInfo"); + public Criteria andPriceNotIn(List values) { + addCriterion("price not in", values, "price"); return (Criteria) this; } - public Criteria andPriceInfoBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("price_info between", value1, value2, "priceInfo"); + public Criteria andPriceBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price between", value1, value2, "price"); return (Criteria) this; } - public Criteria andPriceInfoNotBetween(BigDecimal value1, BigDecimal value2) { - addCriterion("price_info not between", value1, value2, "priceInfo"); + public Criteria andPriceNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("price not between", value1, value2, "price"); return (Criteria) this; } @@ -697,73 +591,73 @@ public class LitemallTopicExample { return (Criteria) this; } - public Criteria andScenePicUrlIsNull() { - addCriterion("scene_pic_url is null"); + public Criteria andPicUrlIsNull() { + addCriterion("pic_url is null"); return (Criteria) this; } - public Criteria andScenePicUrlIsNotNull() { - addCriterion("scene_pic_url is not null"); + public Criteria andPicUrlIsNotNull() { + addCriterion("pic_url is not null"); return (Criteria) this; } - public Criteria andScenePicUrlEqualTo(String value) { - addCriterion("scene_pic_url =", value, "scenePicUrl"); + public Criteria andPicUrlEqualTo(String value) { + addCriterion("pic_url =", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlNotEqualTo(String value) { - addCriterion("scene_pic_url <>", value, "scenePicUrl"); + public Criteria andPicUrlNotEqualTo(String value) { + addCriterion("pic_url <>", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlGreaterThan(String value) { - addCriterion("scene_pic_url >", value, "scenePicUrl"); + public Criteria andPicUrlGreaterThan(String value) { + addCriterion("pic_url >", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlGreaterThanOrEqualTo(String value) { - addCriterion("scene_pic_url >=", value, "scenePicUrl"); + public Criteria andPicUrlGreaterThanOrEqualTo(String value) { + addCriterion("pic_url >=", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlLessThan(String value) { - addCriterion("scene_pic_url <", value, "scenePicUrl"); + public Criteria andPicUrlLessThan(String value) { + addCriterion("pic_url <", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlLessThanOrEqualTo(String value) { - addCriterion("scene_pic_url <=", value, "scenePicUrl"); + public Criteria andPicUrlLessThanOrEqualTo(String value) { + addCriterion("pic_url <=", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlLike(String value) { - addCriterion("scene_pic_url like", value, "scenePicUrl"); + public Criteria andPicUrlLike(String value) { + addCriterion("pic_url like", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlNotLike(String value) { - addCriterion("scene_pic_url not like", value, "scenePicUrl"); + public Criteria andPicUrlNotLike(String value) { + addCriterion("pic_url not like", value, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlIn(List values) { - addCriterion("scene_pic_url in", values, "scenePicUrl"); + public Criteria andPicUrlIn(List values) { + addCriterion("pic_url in", values, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlNotIn(List values) { - addCriterion("scene_pic_url not in", values, "scenePicUrl"); + public Criteria andPicUrlNotIn(List values) { + addCriterion("pic_url not in", values, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlBetween(String value1, String value2) { - addCriterion("scene_pic_url between", value1, value2, "scenePicUrl"); + public Criteria andPicUrlBetween(String value1, String value2) { + addCriterion("pic_url between", value1, value2, "picUrl"); return (Criteria) this; } - public Criteria andScenePicUrlNotBetween(String value1, String value2) { - addCriterion("scene_pic_url not between", value1, value2, "scenePicUrl"); + public Criteria andPicUrlNotBetween(String value1, String value2) { + addCriterion("pic_url not between", value1, value2, "picUrl"); return (Criteria) this; } @@ -827,63 +721,73 @@ public class LitemallTopicExample { return (Criteria) this; } - public Criteria andIsShowIsNull() { - addCriterion("is_show is null"); + public Criteria andGoodsIsNull() { + addCriterion("goods is null"); return (Criteria) this; } - public Criteria andIsShowIsNotNull() { - addCriterion("is_show is not null"); + public Criteria andGoodsIsNotNull() { + addCriterion("goods is not null"); return (Criteria) this; } - public Criteria andIsShowEqualTo(Boolean value) { - addCriterion("is_show =", value, "isShow"); + public Criteria andGoodsEqualTo(Integer[] value) { + addGoodsCriterion("goods =", value, "goods"); return (Criteria) this; } - public Criteria andIsShowNotEqualTo(Boolean value) { - addCriterion("is_show <>", value, "isShow"); + public Criteria andGoodsNotEqualTo(Integer[] value) { + addGoodsCriterion("goods <>", value, "goods"); return (Criteria) this; } - public Criteria andIsShowGreaterThan(Boolean value) { - addCriterion("is_show >", value, "isShow"); + public Criteria andGoodsGreaterThan(Integer[] value) { + addGoodsCriterion("goods >", value, "goods"); return (Criteria) this; } - public Criteria andIsShowGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_show >=", value, "isShow"); + public Criteria andGoodsGreaterThanOrEqualTo(Integer[] value) { + addGoodsCriterion("goods >=", value, "goods"); return (Criteria) this; } - public Criteria andIsShowLessThan(Boolean value) { - addCriterion("is_show <", value, "isShow"); + public Criteria andGoodsLessThan(Integer[] value) { + addGoodsCriterion("goods <", value, "goods"); return (Criteria) this; } - public Criteria andIsShowLessThanOrEqualTo(Boolean value) { - addCriterion("is_show <=", value, "isShow"); + public Criteria andGoodsLessThanOrEqualTo(Integer[] value) { + addGoodsCriterion("goods <=", value, "goods"); return (Criteria) this; } - public Criteria andIsShowIn(List values) { - addCriterion("is_show in", values, "isShow"); + public Criteria andGoodsLike(Integer[] value) { + addGoodsCriterion("goods like", value, "goods"); return (Criteria) this; } - public Criteria andIsShowNotIn(List values) { - addCriterion("is_show not in", values, "isShow"); + public Criteria andGoodsNotLike(Integer[] value) { + addGoodsCriterion("goods not like", value, "goods"); return (Criteria) this; } - public Criteria andIsShowBetween(Boolean value1, Boolean value2) { - addCriterion("is_show between", value1, value2, "isShow"); + public Criteria andGoodsIn(List values) { + addGoodsCriterion("goods in", values, "goods"); return (Criteria) this; } - public Criteria andIsShowNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_show not between", value1, value2, "isShow"); + public Criteria andGoodsNotIn(List values) { + addGoodsCriterion("goods not in", values, "goods"); + return (Criteria) this; + } + + public Criteria andGoodsBetween(Integer[] value1, Integer[] value2) { + addGoodsCriterion("goods between", value1, value2, "goods"); + return (Criteria) this; + } + + public Criteria andGoodsNotBetween(Integer[] value1, Integer[] value2) { + addGoodsCriterion("goods not between", value1, value2, "goods"); return (Criteria) this; } @@ -1072,18 +976,6 @@ public class LitemallTopicExample { return deleted ? andDeletedEqualTo(LitemallTopic.IS_DELETED) : andDeletedNotEqualTo(LitemallTopic.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_topic - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallTopic.IS_DELETED) : andDeletedNotEqualTo(LitemallTopic.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_topic diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java index 1ed51d22..7789eff7 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java @@ -2,6 +2,8 @@ package org.linlinjava.litemall.db.domain; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Arrays; public class LitemallUser { /** @@ -13,16 +15,6 @@ public class LitemallUser { */ public static final Boolean NOT_DELETED = false; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - /** * This field was generated by MyBatis Generator. * This field corresponds to the database table litemall_user @@ -32,16 +24,6 @@ public class LitemallUser { */ public static final Boolean IS_DELETED = true; - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - /** * * This field was generated by MyBatis Generator. @@ -76,7 +58,7 @@ public class LitemallUser { * * @mbg.generated */ - private String gender; + private Byte gender; /** * @@ -112,7 +94,7 @@ public class LitemallUser { * * @mbg.generated */ - private String userLevel; + private Byte userLevel; /** * @@ -132,15 +114,6 @@ public class LitemallUser { */ private String mobile; - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user.register_ip - * - * @mbg.generated - */ - private String registerIp; - /** * * This field was generated by MyBatis Generator. @@ -166,7 +139,7 @@ public class LitemallUser { * * @mbg.generated */ - private String status; + private Byte status; /** * @@ -266,7 +239,7 @@ public class LitemallUser { * * @mbg.generated */ - public String getGender() { + public Byte getGender() { return gender; } @@ -278,7 +251,7 @@ public class LitemallUser { * * @mbg.generated */ - public void setGender(String gender) { + public void setGender(Byte gender) { this.gender = gender; } @@ -362,7 +335,7 @@ public class LitemallUser { * * @mbg.generated */ - public String getUserLevel() { + public Byte getUserLevel() { return userLevel; } @@ -374,7 +347,7 @@ public class LitemallUser { * * @mbg.generated */ - public void setUserLevel(String userLevel) { + public void setUserLevel(Byte userLevel) { this.userLevel = userLevel; } @@ -426,30 +399,6 @@ public class LitemallUser { this.mobile = mobile; } - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user.register_ip - * - * @return the value of litemall_user.register_ip - * - * @mbg.generated - */ - public String getRegisterIp() { - return registerIp; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user.register_ip - * - * @param registerIp the value for litemall_user.register_ip - * - * @mbg.generated - */ - public void setRegisterIp(String registerIp) { - this.registerIp = registerIp; - } - /** * This method was generated by MyBatis Generator. * This method returns the value of the database column litemall_user.avatar @@ -506,7 +455,7 @@ public class LitemallUser { * * @mbg.generated */ - public String getStatus() { + public Byte getStatus() { return status; } @@ -518,7 +467,7 @@ public class LitemallUser { * * @mbg.generated */ - public void setStatus(String status) { + public void setStatus(Byte status) { this.status = status; } @@ -592,7 +541,6 @@ public class LitemallUser { sb.append(", userLevel=").append(userLevel); sb.append(", nickname=").append(nickname); sb.append(", mobile=").append(mobile); - sb.append(", registerIp=").append(registerIp); sb.append(", avatar=").append(avatar); sb.append(", weixinOpenid=").append(weixinOpenid); sb.append(", status=").append(status); @@ -630,7 +578,6 @@ public class LitemallUser { && (this.getUserLevel() == null ? other.getUserLevel() == null : this.getUserLevel().equals(other.getUserLevel())) && (this.getNickname() == null ? other.getNickname() == null : this.getNickname().equals(other.getNickname())) && (this.getMobile() == null ? other.getMobile() == null : this.getMobile().equals(other.getMobile())) - && (this.getRegisterIp() == null ? other.getRegisterIp() == null : this.getRegisterIp().equals(other.getRegisterIp())) && (this.getAvatar() == null ? other.getAvatar() == null : this.getAvatar().equals(other.getAvatar())) && (this.getWeixinOpenid() == null ? other.getWeixinOpenid() == null : this.getWeixinOpenid().equals(other.getWeixinOpenid())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) @@ -658,7 +605,6 @@ public class LitemallUser { result = prime * result + ((getUserLevel() == null) ? 0 : getUserLevel().hashCode()); result = prime * result + ((getNickname() == null) ? 0 : getNickname().hashCode()); result = prime * result + ((getMobile() == null) ? 0 : getMobile().hashCode()); - result = prime * result + ((getRegisterIp() == null) ? 0 : getRegisterIp().hashCode()); result = prime * result + ((getAvatar() == null) ? 0 : getAvatar().hashCode()); result = prime * result + ((getWeixinOpenid() == null) ? 0 : getWeixinOpenid().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); @@ -689,17 +635,16 @@ public class LitemallUser { id("id", "id", "INTEGER"), username("username", "username", "VARCHAR"), password("password", "password", "VARCHAR"), - gender("gender", "gender", "VARCHAR"), + gender("gender", "gender", "TINYINT"), birthday("birthday", "birthday", "DATE"), lastLoginTime("last_login_time", "lastLoginTime", "TIMESTAMP"), lastLoginIp("last_login_ip", "lastLoginIp", "VARCHAR"), - userLevel("user_level", "userLevel", "VARCHAR"), + userLevel("user_level", "userLevel", "TINYINT"), nickname("nickname", "nickname", "VARCHAR"), mobile("mobile", "mobile", "VARCHAR"), - registerIp("register_ip", "registerIp", "VARCHAR"), avatar("avatar", "avatar", "VARCHAR"), weixinOpenid("weixin_openid", "weixinOpenid", "VARCHAR"), - status("status", "status", "VARCHAR"), + status("status", "status", "TINYINT"), addTime("add_time", "addTime", "TIMESTAMP"), deleted("deleted", "deleted", "BIT"); @@ -808,5 +753,20 @@ public class LitemallUser { public String asc() { return this.column + " ASC"; } + + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table litemall_user + * + * @mbg.generated + * @project https://github.com/itfsw/mybatis-generator-plugin + */ + public static Column[] excludes(Column ... excludes) { + ArrayList columns = new ArrayList<>(Arrays.asList(Column.values())); + if (excludes != null && excludes.length > 0) { + columns.removeAll(new ArrayList<>(Arrays.asList(excludes))); + } + return columns.toArray(new Column[]{}); + } } } \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCoupon.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCoupon.java deleted file mode 100644 index c40984dc..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCoupon.java +++ /dev/null @@ -1,478 +0,0 @@ -package org.linlinjava.litemall.db.domain; - -import java.time.LocalDateTime; - -public class LitemallUserCoupon { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public static final Boolean NOT_DELETED = false; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_ON = false; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public static final Boolean IS_DELETED = true; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public static final Boolean DEL_FLAG_OFF = true; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.id - * - * @mbg.generated - */ - private Integer id; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.coupon_id - * - * @mbg.generated - */ - private Integer couponId; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.user_id - * - * @mbg.generated - */ - private Integer userId; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.order_id - * - * @mbg.generated - */ - private Integer orderId; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.used_time - * - * @mbg.generated - */ - private LocalDateTime usedTime; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.add_time - * - * @mbg.generated - */ - private LocalDateTime addTime; - - /** - * - * This field was generated by MyBatis Generator. - * This field corresponds to the database column litemall_user_coupon.deleted - * - * @mbg.generated - */ - private Boolean deleted; - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.id - * - * @return the value of litemall_user_coupon.id - * - * @mbg.generated - */ - public Integer getId() { - return id; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.id - * - * @param id the value for litemall_user_coupon.id - * - * @mbg.generated - */ - public void setId(Integer id) { - this.id = id; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.coupon_id - * - * @return the value of litemall_user_coupon.coupon_id - * - * @mbg.generated - */ - public Integer getCouponId() { - return couponId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.coupon_id - * - * @param couponId the value for litemall_user_coupon.coupon_id - * - * @mbg.generated - */ - public void setCouponId(Integer couponId) { - this.couponId = couponId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.user_id - * - * @return the value of litemall_user_coupon.user_id - * - * @mbg.generated - */ - public Integer getUserId() { - return userId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.user_id - * - * @param userId the value for litemall_user_coupon.user_id - * - * @mbg.generated - */ - public void setUserId(Integer userId) { - this.userId = userId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.order_id - * - * @return the value of litemall_user_coupon.order_id - * - * @mbg.generated - */ - public Integer getOrderId() { - return orderId; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.order_id - * - * @param orderId the value for litemall_user_coupon.order_id - * - * @mbg.generated - */ - public void setOrderId(Integer orderId) { - this.orderId = orderId; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.used_time - * - * @return the value of litemall_user_coupon.used_time - * - * @mbg.generated - */ - public LocalDateTime getUsedTime() { - return usedTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.used_time - * - * @param usedTime the value for litemall_user_coupon.used_time - * - * @mbg.generated - */ - public void setUsedTime(LocalDateTime usedTime) { - this.usedTime = usedTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.add_time - * - * @return the value of litemall_user_coupon.add_time - * - * @mbg.generated - */ - public LocalDateTime getAddTime() { - return addTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.add_time - * - * @param addTime the value for litemall_user_coupon.add_time - * - * @mbg.generated - */ - public void setAddTime(LocalDateTime addTime) { - this.addTime = addTime; - } - - /** - * This method was generated by MyBatis Generator. - * This method returns the value of the database column litemall_user_coupon.deleted - * - * @return the value of litemall_user_coupon.deleted - * - * @mbg.generated - */ - public Boolean getDeleted() { - return deleted; - } - - /** - * This method was generated by MyBatis Generator. - * This method sets the value of the database column litemall_user_coupon.deleted - * - * @param deleted the value for litemall_user_coupon.deleted - * - * @mbg.generated - */ - public void setDeleted(Boolean deleted) { - this.deleted = deleted; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", id=").append(id); - sb.append(", couponId=").append(couponId); - sb.append(", userId=").append(userId); - sb.append(", orderId=").append(orderId); - sb.append(", usedTime=").append(usedTime); - sb.append(", addTime=").append(addTime); - sb.append(", deleted=").append(deleted); - sb.append("]"); - return sb.toString(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - LitemallUserCoupon other = (LitemallUserCoupon) that; - return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) - && (this.getCouponId() == null ? other.getCouponId() == null : this.getCouponId().equals(other.getCouponId())) - && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId())) - && (this.getOrderId() == null ? other.getOrderId() == null : this.getOrderId().equals(other.getOrderId())) - && (this.getUsedTime() == null ? other.getUsedTime() == null : this.getUsedTime().equals(other.getUsedTime())) - && (this.getAddTime() == null ? other.getAddTime() == null : this.getAddTime().equals(other.getAddTime())) - && (this.getDeleted() == null ? other.getDeleted() == null : this.getDeleted().equals(other.getDeleted())); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); - result = prime * result + ((getCouponId() == null) ? 0 : getCouponId().hashCode()); - result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode()); - result = prime * result + ((getOrderId() == null) ? 0 : getOrderId().hashCode()); - result = prime * result + ((getUsedTime() == null) ? 0 : getUsedTime().hashCode()); - result = prime * result + ((getAddTime() == null) ? 0 : getAddTime().hashCode()); - result = prime * result + ((getDeleted() == null) ? 0 : getDeleted().hashCode()); - return result; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public void andLogicalDeleted(boolean deleted) { - setDeleted(deleted ? IS_DELETED : NOT_DELETED); - } - - /** - * This enum was generated by MyBatis Generator. - * This enum corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public enum Column { - id("id", "id", "INTEGER"), - couponId("coupon_id", "couponId", "INTEGER"), - userId("user_id", "userId", "INTEGER"), - orderId("order_id", "orderId", "INTEGER"), - usedTime("used_time", "usedTime", "TIMESTAMP"), - addTime("add_time", "addTime", "TIMESTAMP"), - deleted("deleted", "deleted", "BIT"); - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String column; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String javaProperty; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private final String jdbcType; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String value() { - return this.column; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getValue() { - return this.column; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getJavaProperty() { - return this.javaProperty; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String getJdbcType() { - return this.jdbcType; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - Column(String column, String javaProperty, String jdbcType) { - this.column = column; - this.javaProperty = javaProperty; - this.jdbcType = jdbcType; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String desc() { - return this.column + " DESC"; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public String asc() { - return this.column + " ASC"; - } - } -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCouponExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCouponExample.java deleted file mode 100644 index 790f7638..00000000 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCouponExample.java +++ /dev/null @@ -1,836 +0,0 @@ -package org.linlinjava.litemall.db.domain; - -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.List; - -public class LitemallUserCouponExample { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - protected String orderByClause; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - protected boolean distinct; - - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - protected List oredCriteria; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public LitemallUserCouponExample() { - oredCriteria = new ArrayList(); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public String getOrderByClause() { - return orderByClause; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public boolean isDistinct() { - return distinct; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public List getOredCriteria() { - return oredCriteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallUserCouponExample orderBy(String orderByClause) { - this.setOrderByClause(orderByClause); - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallUserCouponExample orderBy(String ... orderByClauses) { - StringBuffer sb = new StringBuffer(); - for (int i = 0; i < orderByClauses.length; i++) { - sb.append(orderByClauses[i]); - if (i < orderByClauses.length - 1) { - sb.append(" , "); - } - } - this.setOrderByClause(sb.toString()); - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(this); - return criteria; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andIdIsNull() { - addCriterion("id is null"); - return (Criteria) this; - } - - public Criteria andIdIsNotNull() { - addCriterion("id is not null"); - return (Criteria) this; - } - - public Criteria andIdEqualTo(Integer value) { - addCriterion("id =", value, "id"); - return (Criteria) this; - } - - public Criteria andIdNotEqualTo(Integer value) { - addCriterion("id <>", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThan(Integer value) { - addCriterion("id >", value, "id"); - return (Criteria) this; - } - - public Criteria andIdGreaterThanOrEqualTo(Integer value) { - addCriterion("id >=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThan(Integer value) { - addCriterion("id <", value, "id"); - return (Criteria) this; - } - - public Criteria andIdLessThanOrEqualTo(Integer value) { - addCriterion("id <=", value, "id"); - return (Criteria) this; - } - - public Criteria andIdIn(List values) { - addCriterion("id in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdNotIn(List values) { - addCriterion("id not in", values, "id"); - return (Criteria) this; - } - - public Criteria andIdBetween(Integer value1, Integer value2) { - addCriterion("id between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andIdNotBetween(Integer value1, Integer value2) { - addCriterion("id not between", value1, value2, "id"); - return (Criteria) this; - } - - public Criteria andCouponIdIsNull() { - addCriterion("coupon_id is null"); - return (Criteria) this; - } - - public Criteria andCouponIdIsNotNull() { - addCriterion("coupon_id is not null"); - return (Criteria) this; - } - - public Criteria andCouponIdEqualTo(Integer value) { - addCriterion("coupon_id =", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdNotEqualTo(Integer value) { - addCriterion("coupon_id <>", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdGreaterThan(Integer value) { - addCriterion("coupon_id >", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdGreaterThanOrEqualTo(Integer value) { - addCriterion("coupon_id >=", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdLessThan(Integer value) { - addCriterion("coupon_id <", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdLessThanOrEqualTo(Integer value) { - addCriterion("coupon_id <=", value, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdIn(List values) { - addCriterion("coupon_id in", values, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdNotIn(List values) { - addCriterion("coupon_id not in", values, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdBetween(Integer value1, Integer value2) { - addCriterion("coupon_id between", value1, value2, "couponId"); - return (Criteria) this; - } - - public Criteria andCouponIdNotBetween(Integer value1, Integer value2) { - addCriterion("coupon_id not between", value1, value2, "couponId"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(Integer value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(Integer value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(Integer value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(Integer value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(Integer value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(Integer value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(Integer value1, Integer value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(Integer value1, Integer value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andOrderIdIsNull() { - addCriterion("order_id is null"); - return (Criteria) this; - } - - public Criteria andOrderIdIsNotNull() { - addCriterion("order_id is not null"); - return (Criteria) this; - } - - public Criteria andOrderIdEqualTo(Integer value) { - addCriterion("order_id =", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotEqualTo(Integer value) { - addCriterion("order_id <>", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThan(Integer value) { - addCriterion("order_id >", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdGreaterThanOrEqualTo(Integer value) { - addCriterion("order_id >=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThan(Integer value) { - addCriterion("order_id <", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdLessThanOrEqualTo(Integer value) { - addCriterion("order_id <=", value, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdIn(List values) { - addCriterion("order_id in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotIn(List values) { - addCriterion("order_id not in", values, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdBetween(Integer value1, Integer value2) { - addCriterion("order_id between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andOrderIdNotBetween(Integer value1, Integer value2) { - addCriterion("order_id not between", value1, value2, "orderId"); - return (Criteria) this; - } - - public Criteria andUsedTimeIsNull() { - addCriterion("used_time is null"); - return (Criteria) this; - } - - public Criteria andUsedTimeIsNotNull() { - addCriterion("used_time is not null"); - return (Criteria) this; - } - - public Criteria andUsedTimeEqualTo(LocalDateTime value) { - addCriterion("used_time =", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeNotEqualTo(LocalDateTime value) { - addCriterion("used_time <>", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeGreaterThan(LocalDateTime value) { - addCriterion("used_time >", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("used_time >=", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeLessThan(LocalDateTime value) { - addCriterion("used_time <", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("used_time <=", value, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeIn(List values) { - addCriterion("used_time in", values, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeNotIn(List values) { - addCriterion("used_time not in", values, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("used_time between", value1, value2, "usedTime"); - return (Criteria) this; - } - - public Criteria andUsedTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("used_time not between", value1, value2, "usedTime"); - return (Criteria) this; - } - - public Criteria andAddTimeIsNull() { - addCriterion("add_time is null"); - return (Criteria) this; - } - - public Criteria andAddTimeIsNotNull() { - addCriterion("add_time is not null"); - return (Criteria) this; - } - - public Criteria andAddTimeEqualTo(LocalDateTime value) { - addCriterion("add_time =", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotEqualTo(LocalDateTime value) { - addCriterion("add_time <>", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeGreaterThan(LocalDateTime value) { - addCriterion("add_time >", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeGreaterThanOrEqualTo(LocalDateTime value) { - addCriterion("add_time >=", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeLessThan(LocalDateTime value) { - addCriterion("add_time <", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeLessThanOrEqualTo(LocalDateTime value) { - addCriterion("add_time <=", value, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeIn(List values) { - addCriterion("add_time in", values, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotIn(List values) { - addCriterion("add_time not in", values, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("add_time between", value1, value2, "addTime"); - return (Criteria) this; - } - - public Criteria andAddTimeNotBetween(LocalDateTime value1, LocalDateTime value2) { - addCriterion("add_time not between", value1, value2, "addTime"); - return (Criteria) this; - } - - public Criteria andDeletedIsNull() { - addCriterion("deleted is null"); - return (Criteria) this; - } - - public Criteria andDeletedIsNotNull() { - addCriterion("deleted is not null"); - return (Criteria) this; - } - - public Criteria andDeletedEqualTo(Boolean value) { - addCriterion("deleted =", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotEqualTo(Boolean value) { - addCriterion("deleted <>", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThan(Boolean value) { - addCriterion("deleted >", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedGreaterThanOrEqualTo(Boolean value) { - addCriterion("deleted >=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThan(Boolean value) { - addCriterion("deleted <", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedLessThanOrEqualTo(Boolean value) { - addCriterion("deleted <=", value, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedIn(List values) { - addCriterion("deleted in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotIn(List values) { - addCriterion("deleted not in", values, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedBetween(Boolean value1, Boolean value2) { - addCriterion("deleted between", value1, value2, "deleted"); - return (Criteria) this; - } - - public Criteria andDeletedNotBetween(Boolean value1, Boolean value2) { - addCriterion("deleted not between", value1, value2, "deleted"); - return (Criteria) this; - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_user_coupon - * - * @mbg.generated do_not_delete_during_merge - */ - public static class Criteria extends GeneratedCriteria { - /** - * This field was generated by MyBatis Generator. - * This field corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - private LitemallUserCouponExample example; - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - protected Criteria(LitemallUserCouponExample example) { - super(); - this.example = example; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public LitemallUserCouponExample example() { - return this.example; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public Criteria andIf(boolean ifAdd, ICriteriaAdd add) { - if (ifAdd) { - add.add(this); - } - return this; - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public Criteria andLogicalDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallUserCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallUserCoupon.IS_DELETED); - } - - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallUserCoupon.IS_DELETED) : andDeletedNotEqualTo(LitemallUserCoupon.IS_DELETED); - } - - /** - * This interface was generated by MyBatis Generator. - * This interface corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - public interface ICriteriaAdd { - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user_coupon - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - Criteria add(Criteria add); - } - } - - /** - * This class was generated by MyBatis Generator. - * This class corresponds to the database table litemall_user_coupon - * - * @mbg.generated - */ - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java index ca23a96e..9653f12f 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java @@ -437,62 +437,52 @@ public class LitemallUserExample { return (Criteria) this; } - public Criteria andGenderEqualTo(String value) { + public Criteria andGenderEqualTo(Byte value) { addCriterion("gender =", value, "gender"); return (Criteria) this; } - public Criteria andGenderNotEqualTo(String value) { + public Criteria andGenderNotEqualTo(Byte value) { addCriterion("gender <>", value, "gender"); return (Criteria) this; } - public Criteria andGenderGreaterThan(String value) { + public Criteria andGenderGreaterThan(Byte value) { addCriterion("gender >", value, "gender"); return (Criteria) this; } - public Criteria andGenderGreaterThanOrEqualTo(String value) { + public Criteria andGenderGreaterThanOrEqualTo(Byte value) { addCriterion("gender >=", value, "gender"); return (Criteria) this; } - public Criteria andGenderLessThan(String value) { + public Criteria andGenderLessThan(Byte value) { addCriterion("gender <", value, "gender"); return (Criteria) this; } - public Criteria andGenderLessThanOrEqualTo(String value) { + public Criteria andGenderLessThanOrEqualTo(Byte value) { addCriterion("gender <=", value, "gender"); return (Criteria) this; } - public Criteria andGenderLike(String value) { - addCriterion("gender like", value, "gender"); - return (Criteria) this; - } - - public Criteria andGenderNotLike(String value) { - addCriterion("gender not like", value, "gender"); - return (Criteria) this; - } - - public Criteria andGenderIn(List values) { + public Criteria andGenderIn(List values) { addCriterion("gender in", values, "gender"); return (Criteria) this; } - public Criteria andGenderNotIn(List values) { + public Criteria andGenderNotIn(List values) { addCriterion("gender not in", values, "gender"); return (Criteria) this; } - public Criteria andGenderBetween(String value1, String value2) { + public Criteria andGenderBetween(Byte value1, Byte value2) { addCriterion("gender between", value1, value2, "gender"); return (Criteria) this; } - public Criteria andGenderNotBetween(String value1, String value2) { + public Criteria andGenderNotBetween(Byte value1, Byte value2) { addCriterion("gender not between", value1, value2, "gender"); return (Criteria) this; } @@ -697,62 +687,52 @@ public class LitemallUserExample { return (Criteria) this; } - public Criteria andUserLevelEqualTo(String value) { + public Criteria andUserLevelEqualTo(Byte value) { addCriterion("user_level =", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelNotEqualTo(String value) { + public Criteria andUserLevelNotEqualTo(Byte value) { addCriterion("user_level <>", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelGreaterThan(String value) { + public Criteria andUserLevelGreaterThan(Byte value) { addCriterion("user_level >", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelGreaterThanOrEqualTo(String value) { + public Criteria andUserLevelGreaterThanOrEqualTo(Byte value) { addCriterion("user_level >=", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelLessThan(String value) { + public Criteria andUserLevelLessThan(Byte value) { addCriterion("user_level <", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelLessThanOrEqualTo(String value) { + public Criteria andUserLevelLessThanOrEqualTo(Byte value) { addCriterion("user_level <=", value, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelLike(String value) { - addCriterion("user_level like", value, "userLevel"); - return (Criteria) this; - } - - public Criteria andUserLevelNotLike(String value) { - addCriterion("user_level not like", value, "userLevel"); - return (Criteria) this; - } - - public Criteria andUserLevelIn(List values) { + public Criteria andUserLevelIn(List values) { addCriterion("user_level in", values, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelNotIn(List values) { + public Criteria andUserLevelNotIn(List values) { addCriterion("user_level not in", values, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelBetween(String value1, String value2) { + public Criteria andUserLevelBetween(Byte value1, Byte value2) { addCriterion("user_level between", value1, value2, "userLevel"); return (Criteria) this; } - public Criteria andUserLevelNotBetween(String value1, String value2) { + public Criteria andUserLevelNotBetween(Byte value1, Byte value2) { addCriterion("user_level not between", value1, value2, "userLevel"); return (Criteria) this; } @@ -897,76 +877,6 @@ public class LitemallUserExample { return (Criteria) this; } - public Criteria andRegisterIpIsNull() { - addCriterion("register_ip is null"); - return (Criteria) this; - } - - public Criteria andRegisterIpIsNotNull() { - addCriterion("register_ip is not null"); - return (Criteria) this; - } - - public Criteria andRegisterIpEqualTo(String value) { - addCriterion("register_ip =", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpNotEqualTo(String value) { - addCriterion("register_ip <>", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpGreaterThan(String value) { - addCriterion("register_ip >", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpGreaterThanOrEqualTo(String value) { - addCriterion("register_ip >=", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpLessThan(String value) { - addCriterion("register_ip <", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpLessThanOrEqualTo(String value) { - addCriterion("register_ip <=", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpLike(String value) { - addCriterion("register_ip like", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpNotLike(String value) { - addCriterion("register_ip not like", value, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpIn(List values) { - addCriterion("register_ip in", values, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpNotIn(List values) { - addCriterion("register_ip not in", values, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpBetween(String value1, String value2) { - addCriterion("register_ip between", value1, value2, "registerIp"); - return (Criteria) this; - } - - public Criteria andRegisterIpNotBetween(String value1, String value2) { - addCriterion("register_ip not between", value1, value2, "registerIp"); - return (Criteria) this; - } - public Criteria andAvatarIsNull() { addCriterion("avatar is null"); return (Criteria) this; @@ -1117,62 +1027,52 @@ public class LitemallUserExample { return (Criteria) this; } - public Criteria andStatusEqualTo(String value) { + public Criteria andStatusEqualTo(Byte value) { addCriterion("`status` =", value, "status"); return (Criteria) this; } - public Criteria andStatusNotEqualTo(String value) { + public Criteria andStatusNotEqualTo(Byte value) { addCriterion("`status` <>", value, "status"); return (Criteria) this; } - public Criteria andStatusGreaterThan(String value) { + public Criteria andStatusGreaterThan(Byte value) { addCriterion("`status` >", value, "status"); return (Criteria) this; } - public Criteria andStatusGreaterThanOrEqualTo(String value) { + public Criteria andStatusGreaterThanOrEqualTo(Byte value) { addCriterion("`status` >=", value, "status"); return (Criteria) this; } - public Criteria andStatusLessThan(String value) { + public Criteria andStatusLessThan(Byte value) { addCriterion("`status` <", value, "status"); return (Criteria) this; } - public Criteria andStatusLessThanOrEqualTo(String value) { + public Criteria andStatusLessThanOrEqualTo(Byte value) { addCriterion("`status` <=", value, "status"); return (Criteria) this; } - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { + public Criteria andStatusIn(List values) { addCriterion("`status` in", values, "status"); return (Criteria) this; } - public Criteria andStatusNotIn(List values) { + public Criteria andStatusNotIn(List values) { addCriterion("`status` not in", values, "status"); return (Criteria) this; } - public Criteria andStatusBetween(String value1, String value2) { + public Criteria andStatusBetween(Byte value1, Byte value2) { addCriterion("`status` between", value1, value2, "status"); return (Criteria) this; } - public Criteria andStatusNotBetween(String value1, String value2) { + public Criteria andStatusNotBetween(Byte value1, Byte value2) { addCriterion("`status` not between", value1, value2, "status"); return (Criteria) this; } @@ -1362,18 +1262,6 @@ public class LitemallUserExample { return deleted ? andDeletedEqualTo(LitemallUser.IS_DELETED) : andDeletedNotEqualTo(LitemallUser.IS_DELETED); } - /** - * This method was generated by MyBatis Generator. - * This method corresponds to the database table litemall_user - * - * @mbg.generated - * @project https://github.com/itfsw/mybatis-generator-plugin - */ - @Deprecated - public Criteria andDeleted(boolean deleted) { - return deleted ? andDeletedEqualTo(LitemallUser.IS_DELETED) : andDeletedNotEqualTo(LitemallUser.IS_DELETED); - } - /** * This interface was generated by MyBatis Generator. * This interface corresponds to the database table litemall_user diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java index 3dbfe130..146d954f 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java @@ -15,9 +15,9 @@ public class LitemallAdService { @Resource private LitemallAdMapper adMapper; - public List queryByApid(Integer i) { + public List queryIndex() { LitemallAdExample example = new LitemallAdExample(); - example.or().andPositionEqualTo(i).andDeletedEqualTo(false); + example.or().andPositionEqualTo((byte)1).andDeletedEqualTo(false); return adMapper.selectByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java index d0693167..033b233c 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java @@ -15,13 +15,6 @@ public class LitemallBrandService { @Resource private LitemallBrandMapper brandMapper; - public List queryWithNew(int offset, int limit) { - LitemallBrandExample example = new LitemallBrandExample(); - example.or().andIsNewEqualTo(true).andDeletedEqualTo(false); - PageHelper.startPage(offset, limit); - return brandMapper.selectByExample(example); - } - public List query(int offset, int limit) { LitemallBrandExample example = new LitemallBrandExample(); example.or().andDeletedEqualTo(false); @@ -82,4 +75,7 @@ public class LitemallBrandService { brandMapper.insertSelective(brand); } + public List all() { + return brandMapper.selectByExample(new LitemallBrandExample()); + } } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java index 85a55c58..86ec742a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java @@ -37,7 +37,7 @@ public class LitemallCategoryService { public List queryByPid(Integer pid) { LitemallCategoryExample example = new LitemallCategoryExample(); - example.or().andParentIdEqualTo(pid).andDeletedEqualTo(false); + example.or().andPidEqualTo(pid).andDeletedEqualTo(false); return categoryMapper.selectByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java index 07bbaf89..880375d4 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java @@ -21,23 +21,23 @@ public class LitemallCollectService { return (int)collectMapper.countByExample(example); } - public List queryByType(Integer userId, Integer typeId, Integer page, Integer size) { + public List queryByType(Integer userId, Byte type, Integer page, Integer size) { LitemallCollectExample example = new LitemallCollectExample(); - example.or().andUserIdEqualTo(userId).andTypeIdEqualTo(typeId).andDeletedEqualTo(false); + example.or().andUserIdEqualTo(userId).andTypeEqualTo(type).andDeletedEqualTo(false); example.setOrderByClause(LitemallCollect.Column.addTime.desc()); PageHelper.startPage(page, size); return collectMapper.selectByExample(example); } - public int countByType(Integer userId, Integer typeId) { + public int countByType(Integer userId, Byte type) { LitemallCollectExample example = new LitemallCollectExample(); - example.or().andUserIdEqualTo(userId).andTypeIdEqualTo(typeId).andDeletedEqualTo(false); + example.or().andUserIdEqualTo(userId).andTypeEqualTo(type).andDeletedEqualTo(false); return (int)collectMapper.countByExample(example); } - public LitemallCollect queryByTypeAndValue(Integer userId, Integer typeId, Integer valueId) { + public LitemallCollect queryByTypeAndValue(Integer userId, Byte type, Integer valueId) { LitemallCollectExample example = new LitemallCollectExample(); - example.or().andUserIdEqualTo(userId).andValueIdEqualTo(valueId).andTypeIdEqualTo(typeId).andDeletedEqualTo(false); + example.or().andUserIdEqualTo(userId).andValueIdEqualTo(valueId).andTypeEqualTo(type).andDeletedEqualTo(false); return collectMapper.selectOneByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java index 1e7cd1f3..0d4e336a 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java @@ -19,25 +19,25 @@ public class LitemallCommentService { public List queryGoodsByGid(Integer id, int offset, int limit) { LitemallCommentExample example = new LitemallCommentExample(); example.setOrderByClause(LitemallComment.Column.addTime.desc()); - example.or().andValueIdEqualTo(id).andTypeIdEqualTo((byte)0).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(id).andTypeEqualTo((byte)0).andDeletedEqualTo(false); PageHelper.startPage(offset, limit); return commentMapper.selectByExample(example); } public int countGoodsByGid(Integer id, int offset, int limit) { LitemallCommentExample example = new LitemallCommentExample(); - example.or().andValueIdEqualTo(id).andTypeIdEqualTo((byte)0).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(id).andTypeEqualTo((byte)0).andDeletedEqualTo(false); return (int)commentMapper.countByExample(example); } - public List query(Byte typeId, Integer valueId, Integer showType, Integer offset, Integer limit) { + public List query(Byte type, Integer valueId, Integer showType, Integer offset, Integer limit) { LitemallCommentExample example = new LitemallCommentExample(); example.setOrderByClause(LitemallComment.Column.addTime.desc()); if(showType == 0) { - example.or().andValueIdEqualTo(valueId).andTypeIdEqualTo(typeId).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(valueId).andTypeEqualTo(type).andDeletedEqualTo(false); } else if(showType == 1){ - example.or().andValueIdEqualTo(valueId).andTypeIdEqualTo(typeId).andHasPictureEqualTo(true).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(valueId).andTypeEqualTo(type).andHasPictureEqualTo(true).andDeletedEqualTo(false); } else{ Assert.state(false, "showType不支持"); @@ -46,13 +46,13 @@ public class LitemallCommentService { return commentMapper.selectByExample(example); } - public int count(Byte typeId, Integer valueId, Integer showType, Integer offset, Integer size){ + public int count(Byte type, Integer valueId, Integer showType, Integer offset, Integer size){ LitemallCommentExample example = new LitemallCommentExample(); if(showType == 0) { - example.or().andValueIdEqualTo(valueId).andTypeIdEqualTo(typeId).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(valueId).andTypeEqualTo(type).andDeletedEqualTo(false); } else if(showType == 1){ - example.or().andValueIdEqualTo(valueId).andTypeIdEqualTo(typeId).andHasPictureEqualTo(true).andDeletedEqualTo(false); + example.or().andValueIdEqualTo(valueId).andTypeEqualTo(type).andHasPictureEqualTo(true).andDeletedEqualTo(false); } else{ Assert.state(false, ""); @@ -79,7 +79,7 @@ public class LitemallCommentService { criteria.andUserIdEqualTo(Integer.valueOf(userId)); } if(!StringUtils.isEmpty(valueId)){ - criteria.andValueIdEqualTo(Integer.valueOf(valueId)).andTypeIdEqualTo((byte)0); + criteria.andValueIdEqualTo(Integer.valueOf(valueId)).andTypeEqualTo((byte)0); } criteria.andDeletedEqualTo(false); @@ -95,7 +95,7 @@ public class LitemallCommentService { criteria.andUserIdEqualTo(Integer.valueOf(userId)); } if(!StringUtils.isEmpty(valueId)){ - criteria.andValueIdEqualTo(Integer.valueOf(valueId)).andTypeIdEqualTo((byte)0); + criteria.andValueIdEqualTo(Integer.valueOf(valueId)).andTypeEqualTo((byte)0); } criteria.andDeletedEqualTo(false); diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsAttributeService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsAttributeService.java index bf1ae872..e72bfcac 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsAttributeService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsAttributeService.java @@ -60,4 +60,10 @@ public class LitemallGoodsAttributeService { public LitemallGoodsAttribute findById(Integer id) { return goodsAttributeMapper.selectByPrimaryKey(id); } + + public void deleteByGid(Integer gid) { + LitemallGoodsAttributeExample example = new LitemallGoodsAttributeExample(); + example.or().andGoodsIdEqualTo(gid); + goodsAttributeMapper.logicalDeleteByExample(example); + } } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java index 9a3f349a..c8f2ecec 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java @@ -86,7 +86,7 @@ public class LitemallGoodsService { PageHelper.startPage(offset, limit); } - Column[] columns = new Column[]{Column.id, Column.name, Column.listPicUrl, Column.retailPrice}; + Column[] columns = new Column[]{Column.id, Column.name, Column.picUrl, Column.retailPrice}; return goodsMapper.selectByExampleSelective(example ,columns); } @@ -124,7 +124,7 @@ public class LitemallGoodsService { public List queryByIds(List relatedGoodsIds) { LitemallGoodsExample example = new LitemallGoodsExample(); example.or().andIdIn(relatedGoodsIds).andDeletedEqualTo(false); - return goodsMapper.selectByExample(example); + return goodsMapper.selectByExampleWithBLOBs(example); } public Integer queryOnSale() { @@ -146,7 +146,7 @@ public class LitemallGoodsService { criteria.andDeletedEqualTo(false); PageHelper.startPage(page, size); - return goodsMapper.selectByExample(example); + return goodsMapper.selectByExampleWithBLOBs(example); } public int countSelective(String goodsSn, String name, Integer page, Integer size, String sort, String order) { diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsSpecificationService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsSpecificationService.java index ec838822..a7903e2d 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsSpecificationService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsSpecificationService.java @@ -60,6 +60,12 @@ public class LitemallGoodsSpecificationService { goodsSpecificationMapper.logicalDeleteByPrimaryKey(id); } + public void deleteByGid(Integer gid) { + LitemallGoodsSpecificationExample example = new LitemallGoodsSpecificationExample(); + example.or().andGoodsIdEqualTo(gid); + goodsSpecificationMapper.logicalDeleteByExample(example); + } + public void add(LitemallGoodsSpecification goodsSpecification) { goodsSpecificationMapper.insertSelective(goodsSpecification); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java index 01bd2e97..e3867b94 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallOrderService.java @@ -153,7 +153,7 @@ public class LitemallOrderService { public List queryUnconfirm() { LitemallOrderExample example = new LitemallOrderExample(); - example.or().andOrderStatusEqualTo(OrderUtil.STATUS_SHIP).andShipStartTimeIsNotNull().andDeletedEqualTo(false); + example.or().andOrderStatusEqualTo(OrderUtil.STATUS_SHIP).andShipTimeIsNotNull().andDeletedEqualTo(false); return orderMapper.selectByExample(example); } diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallProductService.java b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallProductService.java index e8a80ad6..2259e28c 100644 --- a/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallProductService.java +++ b/litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallProductService.java @@ -67,4 +67,10 @@ public class LitemallProductService { return (int)productMapper.countByExample(example); } + + public void deleteByGid(Integer gid) { + LitemallProductExample example = new LitemallProductExample(); + example.or().andGoodsIdEqualTo(gid); + productMapper.logicalDeleteByExample(example); + } } diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallAdMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallAdMapper.xml index a996b1b0..929ac0b6 100644 --- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallAdMapper.xml +++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallAdMapper.xml @@ -7,10 +7,10 @@ This element is automatically generated by MyBatis Generator, do not modify. --> - + @@ -89,7 +89,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, `position`, `name`, link, url, content, start_time, end_time, enabled, add_time, + id, `name`, link, url, `position`, content, start_time, end_time, enabled, add_time, deleted - - + - - - - - @@ -92,8 +86,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, `name`, list_pic_url, simple_desc, pic_url, sort_order, is_show, floor_price, - app_list_pic_url, is_new, new_pic_url, new_sort_order, add_time, deleted + id, `name`, `desc`, pic_url, sort_order, floor_price, add_time, deleted - id, `name`, keywords, front_desc, parent_id, sort_order, show_index, is_show, banner_url, - icon_url, img_url, wap_banner_url, `level`, `type`, front_name, add_time, deleted + id, `name`, keywords, `desc`, pid, icon_url, pic_url, `level`, sort_order, add_time, + deleted - + - + @@ -126,7 +126,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, type_id, value_id, content, user_id, has_picture, pic_urls, star, add_time, deleted + id, value_id, `type`, content, user_id, has_picture, pic_urls, star, add_time, deleted - - select - - distinct - - - from litemall_coupon - - - - - order by ${orderByClause} - - - - - - - - - delete from litemall_coupon - where id = #{id,jdbcType=INTEGER} - - - - delete from litemall_coupon - - - - - - - - SELECT LAST_INSERT_ID() - - insert into litemall_coupon (`name`, type_money, send_type, - min_amount, max_amount, min_goods_amount, - send_start, send_end, use_start, - use_end, add_time, deleted - ) - values (#{name,jdbcType=VARCHAR}, #{typeMoney,jdbcType=DECIMAL}, #{sendType,jdbcType=TINYINT}, - #{minAmount,jdbcType=DECIMAL}, #{maxAmount,jdbcType=DECIMAL}, #{minGoodsAmount,jdbcType=DECIMAL}, - #{sendStart,jdbcType=TIMESTAMP}, #{sendEnd,jdbcType=TIMESTAMP}, #{useStart,jdbcType=TIMESTAMP}, - #{useEnd,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT} - ) - - - - - SELECT LAST_INSERT_ID() - - insert into litemall_coupon - - - `name`, - - - type_money, - - - send_type, - - - min_amount, - - - max_amount, - - - min_goods_amount, - - - send_start, - - - send_end, - - - use_start, - - - use_end, - - - add_time, - - - deleted, - - - - - #{name,jdbcType=VARCHAR}, - - - #{typeMoney,jdbcType=DECIMAL}, - - - #{sendType,jdbcType=TINYINT}, - - - #{minAmount,jdbcType=DECIMAL}, - - - #{maxAmount,jdbcType=DECIMAL}, - - - #{minGoodsAmount,jdbcType=DECIMAL}, - - - #{sendStart,jdbcType=TIMESTAMP}, - - - #{sendEnd,jdbcType=TIMESTAMP}, - - - #{useStart,jdbcType=TIMESTAMP}, - - - #{useEnd,jdbcType=TIMESTAMP}, - - - #{addTime,jdbcType=TIMESTAMP}, - - - #{deleted,jdbcType=BIT}, - - - - - - - update litemall_coupon - - - id = #{record.id,jdbcType=INTEGER}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - type_money = #{record.typeMoney,jdbcType=DECIMAL}, - - - send_type = #{record.sendType,jdbcType=TINYINT}, - - - min_amount = #{record.minAmount,jdbcType=DECIMAL}, - - - max_amount = #{record.maxAmount,jdbcType=DECIMAL}, - - - min_goods_amount = #{record.minGoodsAmount,jdbcType=DECIMAL}, - - - send_start = #{record.sendStart,jdbcType=TIMESTAMP}, - - - send_end = #{record.sendEnd,jdbcType=TIMESTAMP}, - - - use_start = #{record.useStart,jdbcType=TIMESTAMP}, - - - use_end = #{record.useEnd,jdbcType=TIMESTAMP}, - - - add_time = #{record.addTime,jdbcType=TIMESTAMP}, - - - deleted = #{record.deleted,jdbcType=BIT}, - - - - - - - - - update litemall_coupon - set id = #{record.id,jdbcType=INTEGER}, - `name` = #{record.name,jdbcType=VARCHAR}, - type_money = #{record.typeMoney,jdbcType=DECIMAL}, - send_type = #{record.sendType,jdbcType=TINYINT}, - min_amount = #{record.minAmount,jdbcType=DECIMAL}, - max_amount = #{record.maxAmount,jdbcType=DECIMAL}, - min_goods_amount = #{record.minGoodsAmount,jdbcType=DECIMAL}, - send_start = #{record.sendStart,jdbcType=TIMESTAMP}, - send_end = #{record.sendEnd,jdbcType=TIMESTAMP}, - use_start = #{record.useStart,jdbcType=TIMESTAMP}, - use_end = #{record.useEnd,jdbcType=TIMESTAMP}, - add_time = #{record.addTime,jdbcType=TIMESTAMP}, - deleted = #{record.deleted,jdbcType=BIT} - - - - - - - update litemall_coupon - - - `name` = #{name,jdbcType=VARCHAR}, - - - type_money = #{typeMoney,jdbcType=DECIMAL}, - - - send_type = #{sendType,jdbcType=TINYINT}, - - - min_amount = #{minAmount,jdbcType=DECIMAL}, - - - max_amount = #{maxAmount,jdbcType=DECIMAL}, - - - min_goods_amount = #{minGoodsAmount,jdbcType=DECIMAL}, - - - send_start = #{sendStart,jdbcType=TIMESTAMP}, - - - send_end = #{sendEnd,jdbcType=TIMESTAMP}, - - - use_start = #{useStart,jdbcType=TIMESTAMP}, - - - use_end = #{useEnd,jdbcType=TIMESTAMP}, - - - add_time = #{addTime,jdbcType=TIMESTAMP}, - - - deleted = #{deleted,jdbcType=BIT}, - - - where id = #{id,jdbcType=INTEGER} - - - - update litemall_coupon - set `name` = #{name,jdbcType=VARCHAR}, - type_money = #{typeMoney,jdbcType=DECIMAL}, - send_type = #{sendType,jdbcType=TINYINT}, - min_amount = #{minAmount,jdbcType=DECIMAL}, - max_amount = #{maxAmount,jdbcType=DECIMAL}, - min_goods_amount = #{minGoodsAmount,jdbcType=DECIMAL}, - send_start = #{sendStart,jdbcType=TIMESTAMP}, - send_end = #{sendEnd,jdbcType=TIMESTAMP}, - use_start = #{useStart,jdbcType=TIMESTAMP}, - use_end = #{useEnd,jdbcType=TIMESTAMP}, - add_time = #{addTime,jdbcType=TIMESTAMP}, - deleted = #{deleted,jdbcType=BIT} - where id = #{id,jdbcType=INTEGER} - - - - - - update litemall_coupon set deleted = 1 - - - - - - - update litemall_coupon set deleted = 1 - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml index 6a20e24e..310b4f59 100644 --- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml +++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallGoodsAttributeMapper.xml @@ -8,8 +8,8 @@ --> - + @@ -84,7 +84,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, goods_id, `value`, `attribute`, add_time, deleted + id, goods_id, `attribute`, `value`, add_time, deleted + - @@ -85,7 +85,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, goods_id, `value`, pic_url, specification, add_time, deleted + id, goods_id, specification, `value`, pic_url, add_time, deleted - id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, retail_price, - goods_specification_values, goods_specification_ids, pic_url, add_time, deleted + id, order_id, goods_id, goods_name, goods_sn, product_id, `number`, price, specifications, + pic_url, add_time, deleted - - - + + + @@ -43,21 +43,21 @@ - + and ${criterion.condition} - and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} - and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and ${criterion.condition} - #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} @@ -95,21 +95,21 @@ - + and ${criterion.condition} - and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} - and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + and ${criterion.condition} #{criterion.value,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and #{criterion.secondValue,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} and ${criterion.condition} - #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonIntegerArrayTypeHandler} + #{listItem,typeHandler=org.linlinjava.litemall.db.mybatis.JsonStringArrayTypeHandler} @@ -124,8 +124,7 @@ WARNING - @mbg.generated This element is automatically generated by MyBatis Generator, do not modify. --> - id, goods_id, goods_specification_ids, goods_number, retail_price, url, add_time, - deleted + id, goods_id, specifications, price, `number`, url, add_time, deleted - - select - - distinct - - - from litemall_user_coupon - - - - - order by ${orderByClause} - - - - - - - - - delete from litemall_user_coupon - where id = #{id,jdbcType=INTEGER} - - - - delete from litemall_user_coupon - - - - - - - - SELECT LAST_INSERT_ID() - - insert into litemall_user_coupon (coupon_id, user_id, order_id, - used_time, add_time, deleted - ) - values (#{couponId,jdbcType=INTEGER}, #{userId,jdbcType=INTEGER}, #{orderId,jdbcType=INTEGER}, - #{usedTime,jdbcType=TIMESTAMP}, #{addTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=BIT} - ) - - - - - SELECT LAST_INSERT_ID() - - insert into litemall_user_coupon - - - coupon_id, - - - user_id, - - - order_id, - - - used_time, - - - add_time, - - - deleted, - - - - - #{couponId,jdbcType=INTEGER}, - - - #{userId,jdbcType=INTEGER}, - - - #{orderId,jdbcType=INTEGER}, - - - #{usedTime,jdbcType=TIMESTAMP}, - - - #{addTime,jdbcType=TIMESTAMP}, - - - #{deleted,jdbcType=BIT}, - - - - - - - update litemall_user_coupon - - - id = #{record.id,jdbcType=INTEGER}, - - - coupon_id = #{record.couponId,jdbcType=INTEGER}, - - - user_id = #{record.userId,jdbcType=INTEGER}, - - - order_id = #{record.orderId,jdbcType=INTEGER}, - - - used_time = #{record.usedTime,jdbcType=TIMESTAMP}, - - - add_time = #{record.addTime,jdbcType=TIMESTAMP}, - - - deleted = #{record.deleted,jdbcType=BIT}, - - - - - - - - - update litemall_user_coupon - set id = #{record.id,jdbcType=INTEGER}, - coupon_id = #{record.couponId,jdbcType=INTEGER}, - user_id = #{record.userId,jdbcType=INTEGER}, - order_id = #{record.orderId,jdbcType=INTEGER}, - used_time = #{record.usedTime,jdbcType=TIMESTAMP}, - add_time = #{record.addTime,jdbcType=TIMESTAMP}, - deleted = #{record.deleted,jdbcType=BIT} - - - - - - - update litemall_user_coupon - - - coupon_id = #{couponId,jdbcType=INTEGER}, - - - user_id = #{userId,jdbcType=INTEGER}, - - - order_id = #{orderId,jdbcType=INTEGER}, - - - used_time = #{usedTime,jdbcType=TIMESTAMP}, - - - add_time = #{addTime,jdbcType=TIMESTAMP}, - - - deleted = #{deleted,jdbcType=BIT}, - - - where id = #{id,jdbcType=INTEGER} - - - - update litemall_user_coupon - set coupon_id = #{couponId,jdbcType=INTEGER}, - user_id = #{userId,jdbcType=INTEGER}, - order_id = #{orderId,jdbcType=INTEGER}, - used_time = #{usedTime,jdbcType=TIMESTAMP}, - add_time = #{addTime,jdbcType=TIMESTAMP}, - deleted = #{deleted,jdbcType=BIT} - where id = #{id,jdbcType=INTEGER} - - - - - - update litemall_user_coupon set deleted = 1 - - - - - - - update litemall_user_coupon set deleted = 1 - where id = #{id,jdbcType=INTEGER} - - \ No newline at end of file diff --git a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml index f86321d1..7c7ec3f3 100644 --- a/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml +++ b/litemall-db/src/main/resources/org/linlinjava/litemall/db/dao/LitemallUserMapper.xml @@ -9,17 +9,16 @@ - + - + - - + @@ -95,7 +94,7 @@ This element is automatically generated by MyBatis Generator, do not modify. --> id, username, `password`, gender, birthday, last_login_time, last_login_ip, user_level, - nickname, mobile, register_ip, avatar, weixin_openid, `status`, add_time, deleted + nickname, mobile, avatar, weixin_openid, `status`, add_time, deleted