Skip to content
GitLab
"src/main/webapp/templets/1/default/m/indexa.htm" did not exist on "49d2a620737be00cb8d40668303c47cee8466618"
Unverified Commit b68151cb authored by Menethil's avatar Menethil Committed by GitHub
Browse files

Merge pull request #1 from linlinjava/master 

update
parents 126d027a 02679509
Hide whitespace changes
Inline Side-by-side
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorage.java
View file @ b68151cb
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<Column> 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
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallStorageExample.java
View file @ b68151cb
......@@ -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
......
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopic.java
View file @ b68151cb
......@@ -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<Column> 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
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallTopicExample.java
View file @ b68151cb
......@@ -187,19 +187,50 @@ public class LitemallTopicExample {
* @mbg.generated
*/
protected abstract static class GeneratedCriteria {
protected List<Criterion> goodsCriteria;
protected List<Criterion> allCriteria;
protected List<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
goodsCriteria = new ArrayList<Criterion>();
}
public List<Criterion> 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<Criterion> getAllCriteria() {
return criteria;
if (allCriteria == null) {
allCriteria = new ArrayList<Criterion>();
allCriteria.addAll(criteria);
allCriteria.addAll(goodsCriteria);
}
return allCriteria;
}
public List<Criterion> 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<String> values) {
addCriterion("avatar in", values, "avatar");
return (Criteria) this;
}
public Criteria andAvatarNotIn(List<String> 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<String> values) {
addCriterion("item_pic_url in", values, "itemPicUrl");
return (Criteria) this;
}
public Criteria andItemPicUrlNotIn(List<String> 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<BigDecimal> values) {
addCriterion("price_info in", values, "priceInfo");
public Criteria andPriceIn(List<BigDecimal> values) {
addCriterion("price in", values, "price");
return (Criteria) this;
}
public Criteria andPriceInfoNotIn(List<BigDecimal> values) {
addCriterion("price_info not in", values, "priceInfo");
public Criteria andPriceNotIn(List<BigDecimal> 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<String> values) {
addCriterion("scene_pic_url in", values, "scenePicUrl");
public Criteria andPicUrlIn(List<String> values) {
addCriterion("pic_url in", values, "picUrl");
return (Criteria) this;
}
public Criteria andScenePicUrlNotIn(List<String> values) {
addCriterion("scene_pic_url not in", values, "scenePicUrl");
public Criteria andPicUrlNotIn(List<String> 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<Boolean> values) {
addCriterion("is_show in", values, "isShow");
public Criteria andGoodsLike(Integer[] value) {
addGoodsCriterion("goods like", value, "goods");
return (Criteria) this;
}
public Criteria andIsShowNotIn(List<Boolean> 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<Integer[]> 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<Integer[]> 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
......
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUser.java
View file @ b68151cb
......@@ -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<Column> 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
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCoupon.java deleted 100644 → 0
View file @ 126d027a
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
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserCouponExample.java deleted 100644 → 0
View file @ 126d027a
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<Criteria> 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<Criteria>();
}
/**
* 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<Criteria> 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<Criterion> criteria;
protected GeneratedCriteria() {
super();
criteria = new ArrayList<Criterion>();
}
public boolean isValid() {
return criteria.size() > 0;
}
public List<Criterion> getAllCriteria() {
return criteria;
}
public List<Criterion> 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<Integer> values) {
addCriterion("id in", values, "id");
return (Criteria) this;
}
public Criteria andIdNotIn(List<Integer> 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<Integer> values) {
addCriterion("coupon_id in", values, "couponId");
return (Criteria) this;
}
public Criteria andCouponIdNotIn(List<Integer> 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<Integer> values) {
addCriterion("user_id in", values, "userId");
return (Criteria) this;
}
public Criteria andUserIdNotIn(List<Integer> 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<Integer> values) {
addCriterion("order_id in", values, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdNotIn(List<Integer> 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<LocalDateTime> values) {
addCriterion("used_time in", values, "usedTime");
return (Criteria) this;
}
public Criteria andUsedTimeNotIn(List<LocalDateTime> 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<LocalDateTime> values) {
addCriterion("add_time in", values, "addTime");
return (Criteria) this;
}
public Criteria andAddTimeNotIn(List<LocalDateTime> 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<Boolean> values) {
addCriterion("deleted in", values, "deleted");
return (Criteria) this;
}
public Criteria andDeletedNotIn(List<Boolean> 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
litemall-db/src/main/java/org/linlinjava/litemall/db/domain/LitemallUserExample.java
View file @ b68151cb
......@@ -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<String> values) {
public Criteria andGenderIn(List<Byte> values) {
addCriterion("gender in", values, "gender");
return (Criteria) this;
}
public Criteria andGenderNotIn(List<String> values) {
public Criteria andGenderNotIn(List<Byte> 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<String> values) {
public Criteria andUserLevelIn(List<Byte> values) {
addCriterion("user_level in", values, "userLevel");
return (Criteria) this;
}
public Criteria andUserLevelNotIn(List<String> values) {
public Criteria andUserLevelNotIn(List<Byte> 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<String> values) {
addCriterion("register_ip in", values, "registerIp");
return (Criteria) this;
}
public Criteria andRegisterIpNotIn(List<String> 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<String> values) {
public Criteria andStatusIn(List<Byte> values) {
addCriterion("`status` in", values, "status");
return (Criteria) this;
}
public Criteria andStatusNotIn(List<String> values) {
public Criteria andStatusNotIn(List<Byte> 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
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java
View file @ b68151cb
......@@ -15,9 +15,9 @@ public class LitemallAdService {
@Resource
private LitemallAdMapper adMapper;
public List<LitemallAd> queryByApid(Integer i) {
public List<LitemallAd> queryIndex() {
LitemallAdExample example = new LitemallAdExample();
example.or().andPositionEqualTo(i).andDeletedEqualTo(false);
example.or().andPositionEqualTo((byte)1).andDeletedEqualTo(false);
return adMapper.selectByExample(example);
}
......@@ -33,6 +33,10 @@ public class LitemallAdService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, limit);
return adMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java
View file @ b68151cb
......@@ -63,6 +63,10 @@ public class LitemallAddressService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, limit);
return addressMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdminService.java
View file @ b68151cb
......@@ -32,6 +32,10 @@ public class LitemallAdminService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, limit);
return adminMapper.selectByExampleSelective(example, result);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallBrandService.java
View file @ b68151cb
......@@ -15,13 +15,6 @@ public class LitemallBrandService {
@Resource
private LitemallBrandMapper brandMapper;
public List<LitemallBrand> 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<LitemallBrand> query(int offset, int limit) {
LitemallBrandExample example = new LitemallBrandExample();
example.or().andDeletedEqualTo(false);
......@@ -51,6 +44,10 @@ public class LitemallBrandService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, size);
return brandMapper.selectByExample(example);
}
......@@ -82,4 +79,7 @@ public class LitemallBrandService {
brandMapper.insertSelective(brand);
}
public List<LitemallBrand> all() {
return brandMapper.selectByExample(new LitemallBrandExample());
}
}
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCartService.java
View file @ b68151cb
......@@ -5,6 +5,7 @@ import org.linlinjava.litemall.db.dao.LitemallCartMapper;
import org.linlinjava.litemall.db.domain.LitemallCart;
import org.linlinjava.litemall.db.domain.LitemallCartExample;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.List;
......@@ -77,14 +78,18 @@ public class LitemallCartService {
LitemallCartExample example = new LitemallCartExample();
LitemallCartExample.Criteria criteria = example.createCriteria();
if(userId != null){
if(!StringUtils.isEmpty(userId)){
criteria.andUserIdEqualTo(userId);
}
if(goodsId != null){
if(!StringUtils.isEmpty(goodsId)){
criteria.andGoodsIdEqualTo(goodsId);
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, limit);
return cartMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCategoryService.java
View file @ b68151cb
......@@ -37,7 +37,7 @@ public class LitemallCategoryService {
public List<LitemallCategory> queryByPid(Integer pid) {
LitemallCategoryExample example = new LitemallCategoryExample();
example.or().andParentIdEqualTo(pid).andDeletedEqualTo(false);
example.or().andPidEqualTo(pid).andDeletedEqualTo(false);
return categoryMapper.selectByExample(example);
}
......@@ -63,6 +63,10 @@ public class LitemallCategoryService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, size);
return categoryMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCollectService.java
View file @ b68151cb
......@@ -21,23 +21,23 @@ public class LitemallCollectService {
return (int)collectMapper.countByExample(example);
}
public List<LitemallCollect> queryByType(Integer userId, Integer typeId, Integer page, Integer size) {
public List<LitemallCollect> 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);
}
......@@ -61,6 +61,10 @@ public class LitemallCollectService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, size);
return collectMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCommentService.java
View file @ b68151cb
......@@ -19,25 +19,25 @@ public class LitemallCommentService {
public List<LitemallComment> 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<LitemallComment> query(Byte typeId, Integer valueId, Integer showType, Integer offset, Integer limit) {
public List<LitemallComment> 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,10 +79,14 @@ 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);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, size);
return commentMapper.selectByExample(example);
}
......@@ -95,7 +99,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);
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallCouponService.java deleted 100644 → 0
View file @ 126d027a
package org.linlinjava.litemall.db.service;
import org.springframework.stereotype.Service;
@Service
public class LitemallCouponService {
}
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallFootprintService.java
View file @ b68151cb
......@@ -53,6 +53,10 @@ public class LitemallFootprintService {
}
criteria.andDeletedEqualTo(false);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
PageHelper.startPage(page, size);
return footprintMapper.selectByExample(example);
}
......
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsAttributeService.java
View file @ b68151cb
......@@ -20,31 +20,6 @@ public class LitemallGoodsAttributeService {
return goodsAttributeMapper.selectByExample(example);
}
public List<LitemallGoodsAttribute> querySelective(Integer goodsId, Integer page, Integer size, String sort, String order) {
LitemallGoodsAttributeExample example = new LitemallGoodsAttributeExample();
LitemallGoodsAttributeExample.Criteria criteria = example.createCriteria();
if(goodsId != null){
criteria.andGoodsIdEqualTo(goodsId);
}
criteria.andDeletedEqualTo(false);
PageHelper.startPage(page, size);
return goodsAttributeMapper.selectByExample(example);
}
public int countSelective(Integer goodsId, Integer page, Integer size, String sort, String order) {
LitemallGoodsAttributeExample example = new LitemallGoodsAttributeExample();
LitemallGoodsAttributeExample.Criteria criteria = example.createCriteria();
if(goodsId != null){
criteria.andGoodsIdEqualTo(goodsId);
}
criteria.andDeletedEqualTo(false);
return (int)goodsAttributeMapper.countByExample(example);
}
public void updateById(LitemallGoodsAttribute goodsAttribute) {
goodsAttributeMapper.updateByPrimaryKeySelective(goodsAttribute);
}
......@@ -60,4 +35,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);
}
}
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallGoodsService.java
View file @ b68151cb
......@@ -58,39 +58,40 @@ public class LitemallGoodsService {
return (int)goodsMapper.countByExample(example);
}
public List<LitemallGoods> querySelective(Integer catId, Integer brandId, String keyword, Integer isHot, Integer isNew, Integer offset, Integer limit, String sort) {
public List<LitemallGoods> querySelective(Integer catId, Integer brandId, String keyword, Boolean isHot, Boolean isNew, Integer offset, Integer limit, String sort, String order) {
LitemallGoodsExample example = new LitemallGoodsExample();
LitemallGoodsExample.Criteria criteria = example.createCriteria();
if(catId != null && catId != 0){
if(!StringUtils.isEmpty(catId) && catId != 0){
criteria.andCategoryIdEqualTo(catId);
}
if(brandId != null){
if(!StringUtils.isEmpty(brandId)){
criteria.andBrandIdEqualTo(brandId);
}
if(isNew != null){
criteria.andIsNewEqualTo(isNew.intValue() == 1);
if(!StringUtils.isEmpty(isNew)){
criteria.andIsNewEqualTo(isNew);
}
if(isHot != null){
criteria.andIsHotEqualTo(isHot.intValue() == 1);
if(!StringUtils.isEmpty(isHot)){
criteria.andIsHotEqualTo(isHot);
}
if(keyword != null){
if(!StringUtils.isEmpty(keyword)){
criteria.andKeywordsLike("%" + keyword + "%");
}
criteria.andDeletedEqualTo(false);
if(sort != null){
example.setOrderByClause(sort);
if (!StringUtils.isEmpty(sort) && !StringUtils.isEmpty(order)) {
example.setOrderByClause(sort + " " + order);
}
if(limit != null && offset != null) {
if(!StringUtils.isEmpty(limit) && !StringUtils.isEmpty(offset)) {
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);
}
public int countSelective(Integer catId, Integer brandId, String keyword, Integer isHot, Integer isNew, Integer offset, Integer limit, String sort) {
public int countSelective(Integer catId, Integer brandId, String keyword, Boolean isHot, Boolean isNew, Integer offset, Integer limit, String sort, String order) {
LitemallGoodsExample example = new LitemallGoodsExample();
LitemallGoodsExample.Criteria criteria = example.createCriteria();
......@@ -101,10 +102,10 @@ public class LitemallGoodsService {
criteria.andBrandIdEqualTo(brandId);
}
if(isNew != null){
criteria.andIsNewEqualTo(isNew.intValue() == 1);
criteria.andIsNewEqualTo(isNew);
}
if(isHot != null){
criteria.andIsHotEqualTo(isHot.intValue() == 1);
criteria.andIsHotEqualTo(isHot);
}
if(keyword != null){
criteria.andKeywordsLike("%" + keyword + "%");
......@@ -124,7 +125,7 @@ public class LitemallGoodsService {
public List<LitemallGoods> queryByIds(List<Integer> relatedGoodsIds) {
LitemallGoodsExample example = new LitemallGoodsExample();
example.or().andIdIn(relatedGoodsIds).andDeletedEqualTo(false);
return goodsMapper.selectByExample(example);
return goodsMapper.selectByExampleWithBLOBs(example);
}
public Integer queryOnSale() {
......@@ -146,7 +147,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) {
......@@ -182,7 +183,7 @@ public class LitemallGoodsService {
return (int)goodsMapper.countByExample(example);
}
public List<Integer> getCatIds(Integer brandId, String keyword, Integer isHot, Integer isNew) {
public List<Integer> getCatIds(Integer brandId, String keyword, Boolean isHot, Boolean isNew) {
LitemallGoodsExample example = new LitemallGoodsExample();
LitemallGoodsExample.Criteria criteria = example.createCriteria();
......@@ -190,10 +191,10 @@ public class LitemallGoodsService {
criteria.andBrandIdEqualTo(brandId);
}
if(isNew != null){
criteria.andIsNewEqualTo(isNew.intValue() == 1);
criteria.andIsNewEqualTo(isNew);
}
if(isHot != null){
criteria.andIsHotEqualTo(isHot.intValue() == 1);
criteria.andIsHotEqualTo(isHot);
}
if(keyword != null){
criteria.andKeywordsLike("%" + keyword + "%");
......@@ -207,4 +208,10 @@ public class LitemallGoodsService {
}
return cats;
}
public boolean checkExistByName(String name) {
LitemallGoodsExample example = new LitemallGoodsExample();
example.or().andNameEqualTo(name).andDeletedEqualTo(false);
return goodsMapper.countByExample(example) != 0;
}
}
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment