hurui
/
youtao
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: hurui:15270e323c72085b63432f2a8b3c73c5ed0d8a2e
Branches Tags
hurui:master
..
compare: hurui:c5cff06b2f1d53569d3f4a2c377a6f0483105c63
Branches Tags
hurui:master

No commits in common. '15270e323c72085b63432f2a8b3c73c5ed0d8a2e' and 'c5cff06b2f1d53569d3f4a2c377a6f0483105c63' have entirely different histories.
15270e323c ... c5cff06b2f

4 changed files with 51 additions and 144 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 21
      service/src/main/java/com/hfkj/dao/BsOrderMapper.java
  2. 30
      service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
  3. 36
      service/src/main/java/com/hfkj/entity/BsOrder.java
  4. 108
      service/src/main/java/com/hfkj/entity/BsOrderExample.java

21
service/src/main/java/com/hfkj/dao/BsOrderMapper.java
Unescape View File

@ -43,8 +43,8 @@ public interface BsOrderMapper extends BsOrderMapperExt {
"user_phone, img, ",
"goods_name, customParameters, ",
"goods_count, `type`, ",
"total_price, promotion_amount, ",
"gold, `status`, create_time, ",
"total_price, promotionAmount, ",
"`status`, create_time, ",
"pay_time, cancel_time, ",
"refund_time, finish_time, ",
"update_time, ext_1, ",
@ -53,8 +53,8 @@ public interface BsOrderMapper extends BsOrderMapperExt {
"#{userPhone,jdbcType=VARCHAR}, #{img,jdbcType=VARCHAR}, ",
"#{goodsName,jdbcType=VARCHAR}, #{customparameters,jdbcType=VARCHAR}, ",
"#{goodsCount,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{promotionAmount,jdbcType=DECIMAL}, ",
"#{gold,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{totalPrice,jdbcType=DECIMAL}, #{promotionamount,jdbcType=DECIMAL}, ",
"#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{payTime,jdbcType=TIMESTAMP}, #{cancelTime,jdbcType=TIMESTAMP}, ",
"#{refundTime,jdbcType=TIMESTAMP}, #{finishTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
@ -79,8 +79,7 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="promotion_amount", property="promotionAmount", jdbcType=JdbcType.DECIMAL),
@Result(column="gold", property="gold", jdbcType=JdbcType.DECIMAL),
@Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
@ -97,8 +96,8 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@Select({
"select",
"id, order_no, user_id, user_phone, img, goods_name, customParameters, goods_count, ",
"`type`, total_price, promotion_amount, gold, `status`, create_time, pay_time, ",
"cancel_time, refund_time, finish_time, update_time, ext_1, ext_2, ext_3",
"`type`, total_price, promotionAmount, `status`, create_time, pay_time, cancel_time, ",
"refund_time, finish_time, update_time, ext_1, ext_2, ext_3",
"from bs_order",
"where id = #{id,jdbcType=BIGINT}"
})
@ -113,8 +112,7 @@ public interface BsOrderMapper extends BsOrderMapperExt {
@Result(column="goods_count", property="goodsCount", jdbcType=JdbcType.INTEGER),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="total_price", property="totalPrice", jdbcType=JdbcType.DECIMAL),
@Result(column="promotion_amount", property="promotionAmount", jdbcType=JdbcType.DECIMAL),
@Result(column="gold", property="gold", jdbcType=JdbcType.DECIMAL),
@Result(column="promotionAmount", property="promotionamount", jdbcType=JdbcType.DECIMAL),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP),
@ -148,8 +146,7 @@ public interface BsOrderMapper extends BsOrderMapperExt {
"goods_count = #{goodsCount,jdbcType=INTEGER},",
"`type` = #{type,jdbcType=INTEGER},",
"total_price = #{totalPrice,jdbcType=DECIMAL},",
"promotion_amount = #{promotionAmount,jdbcType=DECIMAL},",
"gold = #{gold,jdbcType=DECIMAL},",
"promotionAmount = #{promotionamount,jdbcType=DECIMAL},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"pay_time = #{payTime,jdbcType=TIMESTAMP},",

30
service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java
Unescape View File

@ -64,12 +64,8 @@ public class BsOrderSqlProvider {
sql.VALUES("total_price", "#{totalPrice,jdbcType=DECIMAL}");
}
if (record.getPromotionAmount() != null) {
sql.VALUES("promotion_amount", "#{promotionAmount,jdbcType=DECIMAL}");
}
if (record.getGold() != null) {
sql.VALUES("gold", "#{gold,jdbcType=DECIMAL}");
if (record.getPromotionamount() != null) {
sql.VALUES("promotionAmount", "#{promotionamount,jdbcType=DECIMAL}");
}
if (record.getStatus() != null) {
@ -131,8 +127,7 @@ public class BsOrderSqlProvider {
sql.SELECT("goods_count");
sql.SELECT("`type`");
sql.SELECT("total_price");
sql.SELECT("promotion_amount");
sql.SELECT("gold");
sql.SELECT("promotionAmount");
sql.SELECT("`status`");
sql.SELECT("create_time");
sql.SELECT("pay_time");
@ -200,12 +195,8 @@ public class BsOrderSqlProvider {
sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
}
if (record.getPromotionAmount() != null) {
sql.SET("promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL}");
}
if (record.getGold() != null) {
sql.SET("gold = #{record.gold,jdbcType=DECIMAL}");
if (record.getPromotionamount() != null) {
sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
}
if (record.getStatus() != null) {
@ -266,8 +257,7 @@ public class BsOrderSqlProvider {
sql.SET("goods_count = #{record.goodsCount,jdbcType=INTEGER}");
sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
sql.SET("total_price = #{record.totalPrice,jdbcType=DECIMAL}");
sql.SET("promotion_amount = #{record.promotionAmount,jdbcType=DECIMAL}");
sql.SET("gold = #{record.gold,jdbcType=DECIMAL}");
sql.SET("promotionAmount = #{record.promotionamount,jdbcType=DECIMAL}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}");
@ -324,12 +314,8 @@ public class BsOrderSqlProvider {
sql.SET("total_price = #{totalPrice,jdbcType=DECIMAL}");
}
if (record.getPromotionAmount() != null) {
sql.SET("promotion_amount = #{promotionAmount,jdbcType=DECIMAL}");
}
if (record.getGold() != null) {
sql.SET("gold = #{gold,jdbcType=DECIMAL}");
if (record.getPromotionamount() != null) {
sql.SET("promotionAmount = #{promotionamount,jdbcType=DECIMAL}");
}
if (record.getStatus() != null) {

36
service/src/main/java/com/hfkj/entity/BsOrder.java
Unescape View File

@ -55,7 +55,7 @@ public class BsOrder implements Serializable {
private Integer goodsCount;
/**
* 类型 1:淘宝 2:拼多多 3:美团 4:饿了么
* 类型 1:淘宝 2:拼多多
*/
private Integer type;
@ -67,15 +67,10 @@ public class BsOrder implements Serializable {
/**
* 佣金金额
*/
private BigDecimal promotionAmount;
private BigDecimal promotionamount;
/**
* 返利元宝数量
*/
private BigDecimal gold;
/**
* 1-已支付 2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚
* 0-已支付；1-已成团；2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚
*/
private Integer status;
@ -197,20 +192,12 @@ public class BsOrder implements Serializable {
this.totalPrice = totalPrice;
}
public BigDecimal getPromotionAmount() {
return promotionAmount;
}
public void setPromotionAmount(BigDecimal promotionAmount) {
this.promotionAmount = promotionAmount;
}
public BigDecimal getGold() {
return gold;
public BigDecimal getPromotionamount() {
return promotionamount;
}
public void setGold(BigDecimal gold) {
this.gold = gold;
public void setPromotionamount(BigDecimal promotionamount) {
this.promotionamount = promotionamount;
}
public Integer getStatus() {
@ -315,8 +302,7 @@ public class BsOrder implements Serializable {
&& (this.getGoodsCount() == null ? other.getGoodsCount() == null : this.getGoodsCount().equals(other.getGoodsCount()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getTotalPrice() == null ? other.getTotalPrice() == null : this.getTotalPrice().equals(other.getTotalPrice()))
&& (this.getPromotionAmount() == null ? other.getPromotionAmount() == null : this.getPromotionAmount().equals(other.getPromotionAmount()))
&& (this.getGold() == null ? other.getGold() == null : this.getGold().equals(other.getGold()))
&& (this.getPromotionamount() == null ? other.getPromotionamount() == null : this.getPromotionamount().equals(other.getPromotionamount()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime()))
@ -343,8 +329,7 @@ public class BsOrder implements Serializable {
result = prime * result + ((getGoodsCount() == null) ? 0 : getGoodsCount().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getTotalPrice() == null) ? 0 : getTotalPrice().hashCode());
result = prime * result + ((getPromotionAmount() == null) ? 0 : getPromotionAmount().hashCode());
result = prime * result + ((getGold() == null) ? 0 : getGold().hashCode());
result = prime * result + ((getPromotionamount() == null) ? 0 : getPromotionamount().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode());
@ -374,8 +359,7 @@ public class BsOrder implements Serializable {
sb.append(", goodsCount=").append(goodsCount);
sb.append(", type=").append(type);
sb.append(", totalPrice=").append(totalPrice);
sb.append(", promotionAmount=").append(promotionAmount);
sb.append(", gold=").append(gold);
sb.append(", promotionamount=").append(promotionamount);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", payTime=").append(payTime);

108
service/src/main/java/com/hfkj/entity/BsOrderExample.java
Unescape View File

@ -776,123 +776,63 @@ public class BsOrderExample {
return (Criteria) this;
}
public Criteria andPromotionAmountIsNull() {
addCriterion("promotion_amount is null");
public Criteria andPromotionamountIsNull() {
addCriterion("promotionAmount is null");
return (Criteria) this;
}
public Criteria andPromotionAmountIsNotNull() {
addCriterion("promotion_amount is not null");
public Criteria andPromotionamountIsNotNull() {
addCriterion("promotionAmount is not null");
return (Criteria) this;
}
public Criteria andPromotionAmountEqualTo(BigDecimal value) {
addCriterion("promotion_amount =", value, "promotionAmount");
public Criteria andPromotionamountEqualTo(BigDecimal value) {
addCriterion("promotionAmount =", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountNotEqualTo(BigDecimal value) {
addCriterion("promotion_amount <>", value, "promotionAmount");
public Criteria andPromotionamountNotEqualTo(BigDecimal value) {
addCriterion("promotionAmount <>", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountGreaterThan(BigDecimal value) {
addCriterion("promotion_amount >", value, "promotionAmount");
public Criteria andPromotionamountGreaterThan(BigDecimal value) {
addCriterion("promotionAmount >", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("promotion_amount >=", value, "promotionAmount");
public Criteria andPromotionamountGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("promotionAmount >=", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountLessThan(BigDecimal value) {
addCriterion("promotion_amount <", value, "promotionAmount");
public Criteria andPromotionamountLessThan(BigDecimal value) {
addCriterion("promotionAmount <", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountLessThanOrEqualTo(BigDecimal value) {
addCriterion("promotion_amount <=", value, "promotionAmount");
public Criteria andPromotionamountLessThanOrEqualTo(BigDecimal value) {
addCriterion("promotionAmount <=", value, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountIn(List<BigDecimal> values) {
addCriterion("promotion_amount in", values, "promotionAmount");
public Criteria andPromotionamountIn(List<BigDecimal> values) {
addCriterion("promotionAmount in", values, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountNotIn(List<BigDecimal> values) {
addCriterion("promotion_amount not in", values, "promotionAmount");
public Criteria andPromotionamountNotIn(List<BigDecimal> values) {
addCriterion("promotionAmount not in", values, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("promotion_amount between", value1, value2, "promotionAmount");
public Criteria andPromotionamountBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("promotionAmount between", value1, value2, "promotionamount");
return (Criteria) this;
}
public Criteria andPromotionAmountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("promotion_amount not between", value1, value2, "promotionAmount");
return (Criteria) this;
}
public Criteria andGoldIsNull() {
addCriterion("gold is null");
return (Criteria) this;
}
public Criteria andGoldIsNotNull() {
addCriterion("gold is not null");
return (Criteria) this;
}
public Criteria andGoldEqualTo(BigDecimal value) {
addCriterion("gold =", value, "gold");
return (Criteria) this;
}
public Criteria andGoldNotEqualTo(BigDecimal value) {
addCriterion("gold <>", value, "gold");
return (Criteria) this;
}
public Criteria andGoldGreaterThan(BigDecimal value) {
addCriterion("gold >", value, "gold");
return (Criteria) this;
}
public Criteria andGoldGreaterThanOrEqualTo(BigDecimal value) {
addCriterion("gold >=", value, "gold");
return (Criteria) this;
}
public Criteria andGoldLessThan(BigDecimal value) {
addCriterion("gold <", value, "gold");
return (Criteria) this;
}
public Criteria andGoldLessThanOrEqualTo(BigDecimal value) {
addCriterion("gold <=", value, "gold");
return (Criteria) this;
}
public Criteria andGoldIn(List<BigDecimal> values) {
addCriterion("gold in", values, "gold");
return (Criteria) this;
}
public Criteria andGoldNotIn(List<BigDecimal> values) {
addCriterion("gold not in", values, "gold");
return (Criteria) this;
}
public Criteria andGoldBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("gold between", value1, value2, "gold");
return (Criteria) this;
}
public Criteria andGoldNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("gold not between", value1, value2, "gold");
public Criteria andPromotionamountNotBetween(BigDecimal value1, BigDecimal value2) {
addCriterion("promotionAmount not between", value1, value2, "promotionamount");
return (Criteria) this;
}

Write Preview
Loading…
Cancel
Save