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

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

@@ -40,13 +40,13 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco
 
     @Insert({
         "insert into bs_cornucopia_lottery_record (lottery_no, lottery_time, ",
-        "`type`, proportion, ",
+        "`type`, user_num, proportion, ",
         "gold_coin, type_name, ",
         "config_msg, create_time, ",
         "update_time, `status`, ",
         "ext_1, ext_2, ext_3)",
         "values (#{lotteryNo,jdbcType=VARCHAR}, #{lotteryTime,jdbcType=TIMESTAMP}, ",
-        "#{type,jdbcType=INTEGER}, #{proportion,jdbcType=DECIMAL}, ",
+        "#{type,jdbcType=INTEGER}, #{userNum,jdbcType=INTEGER}, #{proportion,jdbcType=DECIMAL}, ",
         "#{goldCoin,jdbcType=DECIMAL}, #{typeName,jdbcType=VARCHAR}, ",
         "#{configMsg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
         "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
@@ -65,6 +65,7 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco
         @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="lottery_time", property="lotteryTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="user_num", property="userNum", jdbcType=JdbcType.INTEGER),
         @Result(column="proportion", property="proportion", jdbcType=JdbcType.DECIMAL),
         @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL),
         @Result(column="type_name", property="typeName", jdbcType=JdbcType.VARCHAR),
@@ -80,8 +81,8 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco
 
     @Select({
         "select",
-        "id, lottery_no, lottery_time, `type`, proportion, gold_coin, type_name, config_msg, ",
+        "id, lottery_no, lottery_time, `type`, user_num, proportion, gold_coin, type_name, ",
-        "create_time, update_time, `status`, ext_1, ext_2, ext_3",
+        "config_msg, create_time, update_time, `status`, ext_1, ext_2, ext_3",
         "from bs_cornucopia_lottery_record",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -90,6 +91,7 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco
         @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="lottery_time", property="lotteryTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
+        @Result(column="user_num", property="userNum", jdbcType=JdbcType.INTEGER),
         @Result(column="proportion", property="proportion", jdbcType=JdbcType.DECIMAL),
         @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL),
         @Result(column="type_name", property="typeName", jdbcType=JdbcType.VARCHAR),
@@ -117,6 +119,7 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco
         "set lottery_no = #{lotteryNo,jdbcType=VARCHAR},",
           "lottery_time = #{lotteryTime,jdbcType=TIMESTAMP},",
           "`type` = #{type,jdbcType=INTEGER},",
+          "user_num = #{userNum,jdbcType=INTEGER},",
           "proportion = #{proportion,jdbcType=DECIMAL},",
           "gold_coin = #{goldCoin,jdbcType=DECIMAL},",
           "type_name = #{typeName,jdbcType=VARCHAR},",

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

@@ -40,6 +40,10 @@ public class BsCornucopiaLotteryRecordSqlProvider {
             sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
         }
         
+        if (record.getUserNum() != null) {
+            sql.VALUES("user_num", "#{userNum,jdbcType=INTEGER}");
+        }
+        
         if (record.getProportion() != null) {
             sql.VALUES("proportion", "#{proportion,jdbcType=DECIMAL}");
         }
@@ -93,6 +97,7 @@ public class BsCornucopiaLotteryRecordSqlProvider {
         sql.SELECT("lottery_no");
         sql.SELECT("lottery_time");
         sql.SELECT("`type`");
+        sql.SELECT("user_num");
         sql.SELECT("proportion");
         sql.SELECT("gold_coin");
         sql.SELECT("type_name");
@@ -136,6 +141,10 @@ public class BsCornucopiaLotteryRecordSqlProvider {
             sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
         }
         
+        if (record.getUserNum() != null) {
+            sql.SET("user_num = #{record.userNum,jdbcType=INTEGER}");
+        }
+        
         if (record.getProportion() != null) {
             sql.SET("proportion = #{record.proportion,jdbcType=DECIMAL}");
         }
@@ -188,6 +197,7 @@ public class BsCornucopiaLotteryRecordSqlProvider {
         sql.SET("lottery_no = #{record.lotteryNo,jdbcType=VARCHAR}");
         sql.SET("lottery_time = #{record.lotteryTime,jdbcType=TIMESTAMP}");
         sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
+        sql.SET("user_num = #{record.userNum,jdbcType=INTEGER}");
         sql.SET("proportion = #{record.proportion,jdbcType=DECIMAL}");
         sql.SET("gold_coin = #{record.goldCoin,jdbcType=DECIMAL}");
         sql.SET("type_name = #{record.typeName,jdbcType=VARCHAR}");
@@ -220,6 +230,10 @@ public class BsCornucopiaLotteryRecordSqlProvider {
             sql.SET("`type` = #{type,jdbcType=INTEGER}");
         }
         
+        if (record.getUserNum() != null) {
+            sql.SET("user_num = #{userNum,jdbcType=INTEGER}");
+        }
+        
         if (record.getProportion() != null) {
             sql.SET("proportion = #{proportion,jdbcType=DECIMAL}");
         }

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

@@ -34,6 +34,11 @@ public class BsCornucopiaLotteryRecord implements Serializable {
      */
     private Integer type;
 
+    /**
+     * 参与用户数量
+     */
+    private Integer userNum;
+
     /**
      * 比例
      */
@@ -118,6 +123,14 @@ public class BsCornucopiaLotteryRecord implements Serializable {
         this.type = type;
     }
 
+    public Integer getUserNum() {
+        return userNum;
+    }
+
+    public void setUserNum(Integer userNum) {
+        this.userNum = userNum;
+    }
+
     public BigDecimal getProportion() {
         return proportion;
     }
@@ -214,6 +227,7 @@ public class BsCornucopiaLotteryRecord implements Serializable {
             && (this.getLotteryNo() == null ? other.getLotteryNo() == null : this.getLotteryNo().equals(other.getLotteryNo()))
             && (this.getLotteryTime() == null ? other.getLotteryTime() == null : this.getLotteryTime().equals(other.getLotteryTime()))
             && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
+            && (this.getUserNum() == null ? other.getUserNum() == null : this.getUserNum().equals(other.getUserNum()))
             && (this.getProportion() == null ? other.getProportion() == null : this.getProportion().equals(other.getProportion()))
             && (this.getGoldCoin() == null ? other.getGoldCoin() == null : this.getGoldCoin().equals(other.getGoldCoin()))
             && (this.getTypeName() == null ? other.getTypeName() == null : this.getTypeName().equals(other.getTypeName()))
@@ -234,6 +248,7 @@ public class BsCornucopiaLotteryRecord implements Serializable {
         result = prime * result + ((getLotteryNo() == null) ? 0 : getLotteryNo().hashCode());
         result = prime * result + ((getLotteryTime() == null) ? 0 : getLotteryTime().hashCode());
         result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
+        result = prime * result + ((getUserNum() == null) ? 0 : getUserNum().hashCode());
         result = prime * result + ((getProportion() == null) ? 0 : getProportion().hashCode());
         result = prime * result + ((getGoldCoin() == null) ? 0 : getGoldCoin().hashCode());
         result = prime * result + ((getTypeName() == null) ? 0 : getTypeName().hashCode());
@@ -257,6 +272,7 @@ public class BsCornucopiaLotteryRecord implements Serializable {
         sb.append(", lotteryNo=").append(lotteryNo);
         sb.append(", lotteryTime=").append(lotteryTime);
         sb.append(", type=").append(type);
+        sb.append(", userNum=").append(userNum);
         sb.append(", proportion=").append(proportion);
         sb.append(", goldCoin=").append(goldCoin);
         sb.append(", typeName=").append(typeName);

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

@@ -376,6 +376,66 @@ public class BsCornucopiaLotteryRecordExample {
             return (Criteria) this;
         }
 
+        public Criteria andUserNumIsNull() {
+            addCriterion("user_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumIsNotNull() {
+            addCriterion("user_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumEqualTo(Integer value) {
+            addCriterion("user_num =", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumNotEqualTo(Integer value) {
+            addCriterion("user_num <>", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumGreaterThan(Integer value) {
+            addCriterion("user_num >", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumGreaterThanOrEqualTo(Integer value) {
+            addCriterion("user_num >=", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumLessThan(Integer value) {
+            addCriterion("user_num <", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumLessThanOrEqualTo(Integer value) {
+            addCriterion("user_num <=", value, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumIn(List<Integer> values) {
+            addCriterion("user_num in", values, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumNotIn(List<Integer> values) {
+            addCriterion("user_num not in", values, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumBetween(Integer value1, Integer value2) {
+            addCriterion("user_num between", value1, value2, "userNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andUserNumNotBetween(Integer value1, Integer value2) {
+            addCriterion("user_num not between", value1, value2, "userNum");
+            return (Criteria) this;
+        }
+
         public Criteria andProportionIsNull() {
             addCriterion("proportion is null");
             return (Criteria) this;