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

优惠券、首页品牌、首页新品接口添加

Browse Source
This commit is contained in:
zhh
2018-11-06 17:21:18 +08:00
parent 616c4d3326
commit 8ef1fcc93d
18 changed files with 3758 additions and 2942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mall-mbg/src/main/java/com/macro/mall/model/SmsCoupon.java
View File

@@ -111,6 +111,13 @@ public class SmsCoupon implements Serializable {
*/
private Integer memberLevel;
/**
* 发行数量：0->表示无限制
*
* @mbggenerated
*/
private Integer distributionCount;
private static final long serialVersionUID = 1L;
public Long getId() {
@@ -257,6 +264,14 @@ public class SmsCoupon implements Serializable {
this.memberLevel = memberLevel;
}
public Integer getDistributionCount() {
return distributionCount;
}
public void setDistributionCount(Integer distributionCount) {
this.distributionCount = distributionCount;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -281,6 +296,7 @@ public class SmsCoupon implements Serializable {
sb.append(", enableTime=").append(enableTime);
sb.append(", code=").append(code);
sb.append(", memberLevel=").append(memberLevel);
sb.append(", distributionCount=").append(distributionCount);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

60
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponExample.java
View File

@@ -1215,6 +1215,66 @@ public class SmsCouponExample {
addCriterion("member_level not between", value1, value2, "memberLevel");
return (Criteria) this;
}
public Criteria andDistributionCountIsNull() {
addCriterion("distribution_count is null");
return (Criteria) this;
}
public Criteria andDistributionCountIsNotNull() {
addCriterion("distribution_count is not null");
return (Criteria) this;
}
public Criteria andDistributionCountEqualTo(Integer value) {
addCriterion("distribution_count =", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountNotEqualTo(Integer value) {
addCriterion("distribution_count <>", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountGreaterThan(Integer value) {
addCriterion("distribution_count >", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountGreaterThanOrEqualTo(Integer value) {
addCriterion("distribution_count >=", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountLessThan(Integer value) {
addCriterion("distribution_count <", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountLessThanOrEqualTo(Integer value) {
addCriterion("distribution_count <=", value, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountIn(List<Integer> values) {
addCriterion("distribution_count in", values, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountNotIn(List<Integer> values) {
addCriterion("distribution_count not in", values, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountBetween(Integer value1, Integer value2) {
addCriterion("distribution_count between", value1, value2, "distributionCount");
return (Criteria) this;
}
public Criteria andDistributionCountNotBetween(Integer value1, Integer value2) {
addCriterion("distribution_count not between", value1, value2, "distributionCount");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {

22
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistory.java
View File

@@ -47,7 +47,14 @@ public class SmsCouponHistory implements Serializable {
*
* @mbggenerated
*/
private String orderId;
private Long orderId;
/**
* 订单号码
*
* @mbggenerated
*/
private String orderSn;
private static final long serialVersionUID = 1L;
@@ -123,14 +130,22 @@ public class SmsCouponHistory implements Serializable {
this.useTime = useTime;
}
public String getOrderId() {
public Long getOrderId() {
return orderId;
}
public void setOrderId(String orderId) {
public void setOrderId(Long orderId) {
this.orderId = orderId;
}
public String getOrderSn() {
return orderSn;
}
public void setOrderSn(String orderSn) {
this.orderSn = orderSn;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -147,6 +162,7 @@ public class SmsCouponHistory implements Serializable {
sb.append(", useStatus=").append(useStatus);
sb.append(", useTime=").append(useTime);
sb.append(", orderId=").append(orderId);
sb.append(", orderSn=").append(orderSn);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();

100
mall-mbg/src/main/java/com/macro/mall/model/SmsCouponHistoryExample.java
View File

@@ -675,65 +675,125 @@ public class SmsCouponHistoryExample {
return (Criteria) this;
}
public Criteria andOrderIdEqualTo(String value) {
public Criteria andOrderIdEqualTo(Long value) {
addCriterion("order_id =", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdNotEqualTo(String value) {
public Criteria andOrderIdNotEqualTo(Long value) {
addCriterion("order_id <>", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdGreaterThan(String value) {
public Criteria andOrderIdGreaterThan(Long value) {
addCriterion("order_id >", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdGreaterThanOrEqualTo(String value) {
public Criteria andOrderIdGreaterThanOrEqualTo(Long value) {
addCriterion("order_id >=", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdLessThan(String value) {
public Criteria andOrderIdLessThan(Long value) {
addCriterion("order_id <", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdLessThanOrEqualTo(String value) {
public Criteria andOrderIdLessThanOrEqualTo(Long value) {
addCriterion("order_id <=", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdLike(String value) {
addCriterion("order_id like", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdNotLike(String value) {
addCriterion("order_id not like", value, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdIn(List<String> values) {
public Criteria andOrderIdIn(List<Long> values) {
addCriterion("order_id in", values, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdNotIn(List<String> values) {
public Criteria andOrderIdNotIn(List<Long> values) {
addCriterion("order_id not in", values, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdBetween(String value1, String value2) {
public Criteria andOrderIdBetween(Long value1, Long value2) {
addCriterion("order_id between", value1, value2, "orderId");
return (Criteria) this;
}
public Criteria andOrderIdNotBetween(String value1, String value2) {
public Criteria andOrderIdNotBetween(Long value1, Long value2) {
addCriterion("order_id not between", value1, value2, "orderId");
return (Criteria) this;
}
public Criteria andOrderSnIsNull() {
addCriterion("order_sn is null");
return (Criteria) this;
}
public Criteria andOrderSnIsNotNull() {
addCriterion("order_sn is not null");
return (Criteria) this;
}
public Criteria andOrderSnEqualTo(String value) {
addCriterion("order_sn =", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnNotEqualTo(String value) {
addCriterion("order_sn <>", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnGreaterThan(String value) {
addCriterion("order_sn >", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnGreaterThanOrEqualTo(String value) {
addCriterion("order_sn >=", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnLessThan(String value) {
addCriterion("order_sn <", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnLessThanOrEqualTo(String value) {
addCriterion("order_sn <=", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnLike(String value) {
addCriterion("order_sn like", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnNotLike(String value) {
addCriterion("order_sn not like", value, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnIn(List<String> values) {
addCriterion("order_sn in", values, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnNotIn(List<String> values) {
addCriterion("order_sn not in", values, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnBetween(String value1, String value2) {
addCriterion("order_sn between", value1, value2, "orderSn");
return (Criteria) this;
}
public Criteria andOrderSnNotBetween(String value1, String value2) {
addCriterion("order_sn not between", value1, value2, "orderSn");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {