Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao

service/src/main/java/com/hfkj/dao/BsOrderMapper.java

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

service/src/main/java/com/hfkj/dao/BsOrderSqlProvider.java

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

service/src/main/java/com/hfkj/entity/BsOrder.java

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

service/src/main/java/com/hfkj/entity/BsOrderExample.java

@@ -776,63 +776,123 @@ public class BsOrderExample {
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountIsNull() {
-            addCriterion("promotionAmount is null");
+        public Criteria andPromotionAmountIsNull() {
+            addCriterion("promotion_amount is null");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountIsNotNull() {
-            addCriterion("promotionAmount is not null");
+        public Criteria andPromotionAmountIsNotNull() {
+            addCriterion("promotion_amount is not null");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountEqualTo(BigDecimal value) {
-            addCriterion("promotionAmount =", value, "promotionamount");
+        public Criteria andPromotionAmountEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount =", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountNotEqualTo(BigDecimal value) {
-            addCriterion("promotionAmount <>", value, "promotionamount");
+        public Criteria andPromotionAmountNotEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount <>", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountGreaterThan(BigDecimal value) {
-            addCriterion("promotionAmount >", value, "promotionamount");
+        public Criteria andPromotionAmountGreaterThan(BigDecimal value) {
+            addCriterion("promotion_amount >", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountGreaterThanOrEqualTo(BigDecimal value) {
-            addCriterion("promotionAmount >=", value, "promotionamount");
+        public Criteria andPromotionAmountGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount >=", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountLessThan(BigDecimal value) {
-            addCriterion("promotionAmount <", value, "promotionamount");
+        public Criteria andPromotionAmountLessThan(BigDecimal value) {
+            addCriterion("promotion_amount <", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountLessThanOrEqualTo(BigDecimal value) {
-            addCriterion("promotionAmount <=", value, "promotionamount");
+        public Criteria andPromotionAmountLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("promotion_amount <=", value, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountIn(List<BigDecimal> values) {
-            addCriterion("promotionAmount in", values, "promotionamount");
+        public Criteria andPromotionAmountIn(List<BigDecimal> values) {
+            addCriterion("promotion_amount in", values, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountNotIn(List<BigDecimal> values) {
-            addCriterion("promotionAmount not in", values, "promotionamount");
+        public Criteria andPromotionAmountNotIn(List<BigDecimal> values) {
+            addCriterion("promotion_amount not in", values, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("promotionAmount between", value1, value2, "promotionamount");
+        public Criteria andPromotionAmountBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("promotion_amount between", value1, value2, "promotionAmount");
             return (Criteria) this;
         }
 
-        public Criteria andPromotionamountNotBetween(BigDecimal value1, BigDecimal value2) {
-            addCriterion("promotionAmount not between", value1, value2, "promotionamount");
+        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");
             return (Criteria) this;
         }