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

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

@@ -39,12 +39,12 @@ public interface BsPartnerPoolPreMapper extends BsPartnerPoolPreMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into bs_partner_pool_pre (`level`, num, ",
+        "insert into bs_partner_pool_pre (`level`, lottery_no, ",
         "gold_coin, user_id, ",
         "create_time, update_time, ",
         "`status`, ext_1, ext_2, ",
         "ext_3)",
-        "values (#{level,jdbcType=INTEGER}, #{num,jdbcType=VARCHAR}, ",
+        "values (#{level,jdbcType=INTEGER}, #{lotteryNo,jdbcType=VARCHAR}, ",
         "#{goldCoin,jdbcType=DECIMAL}, #{userId,jdbcType=BIGINT}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
@@ -61,7 +61,7 @@ public interface BsPartnerPoolPreMapper extends BsPartnerPoolPreMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="level", property="level", jdbcType=JdbcType.INTEGER),
-        @Result(column="num", property="num", jdbcType=JdbcType.VARCHAR),
+        @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@@ -75,15 +75,15 @@ public interface BsPartnerPoolPreMapper extends BsPartnerPoolPreMapperExt {
 
     @Select({
         "select",
-        "id, `level`, num, gold_coin, user_id, create_time, update_time, `status`, ext_1, ",
+        "id, `level`, lottery_no, gold_coin, user_id, create_time, update_time, `status`, ",
-        "ext_2, ext_3",
+        "ext_1, ext_2, ext_3",
         "from bs_partner_pool_pre",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="level", property="level", jdbcType=JdbcType.INTEGER),
-        @Result(column="num", property="num", jdbcType=JdbcType.VARCHAR),
+        @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR),
         @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL),
         @Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@@ -107,7 +107,7 @@ public interface BsPartnerPoolPreMapper extends BsPartnerPoolPreMapperExt {
     @Update({
         "update bs_partner_pool_pre",
         "set `level` = #{level,jdbcType=INTEGER},",
-          "num = #{num,jdbcType=VARCHAR},",
+          "lottery_no = #{lotteryNo,jdbcType=VARCHAR},",
           "gold_coin = #{goldCoin,jdbcType=DECIMAL},",
           "user_id = #{userId,jdbcType=BIGINT},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",

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

@@ -32,8 +32,8 @@ public class BsPartnerPoolPreSqlProvider {
             sql.VALUES("`level`", "#{level,jdbcType=INTEGER}");
         }
         
-        if (record.getNum() != null) {
+        if (record.getLotteryNo() != null) {
-            sql.VALUES("num", "#{num,jdbcType=VARCHAR}");
+            sql.VALUES("lottery_no", "#{lotteryNo,jdbcType=VARCHAR}");
         }
         
         if (record.getGoldCoin() != null) {
@@ -79,7 +79,7 @@ public class BsPartnerPoolPreSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("`level`");
-        sql.SELECT("num");
+        sql.SELECT("lottery_no");
         sql.SELECT("gold_coin");
         sql.SELECT("user_id");
         sql.SELECT("create_time");
@@ -113,8 +113,8 @@ public class BsPartnerPoolPreSqlProvider {
             sql.SET("`level` = #{record.level,jdbcType=INTEGER}");
         }
         
-        if (record.getNum() != null) {
+        if (record.getLotteryNo() != null) {
-            sql.SET("num = #{record.num,jdbcType=VARCHAR}");
+            sql.SET("lottery_no = #{record.lotteryNo,jdbcType=VARCHAR}");
         }
         
         if (record.getGoldCoin() != null) {
@@ -159,7 +159,7 @@ public class BsPartnerPoolPreSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("`level` = #{record.level,jdbcType=INTEGER}");
-        sql.SET("num = #{record.num,jdbcType=VARCHAR}");
+        sql.SET("lottery_no = #{record.lotteryNo,jdbcType=VARCHAR}");
         sql.SET("gold_coin = #{record.goldCoin,jdbcType=DECIMAL}");
         sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
@@ -182,8 +182,8 @@ public class BsPartnerPoolPreSqlProvider {
             sql.SET("`level` = #{level,jdbcType=INTEGER}");
         }
         
-        if (record.getNum() != null) {
+        if (record.getLotteryNo() != null) {
-            sql.SET("num = #{num,jdbcType=VARCHAR}");
+            sql.SET("lottery_no = #{lotteryNo,jdbcType=VARCHAR}");
         }
         
         if (record.getGoldCoin() != null) {

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

@@ -25,9 +25,9 @@ public class BsPartnerPoolPre implements Serializable {
     private Integer level;
 
     /**
-     * 编号
+     * 期号
      */
-    private String num;
+    private String lotteryNo;
 
     /**
      * 竞选元宝
@@ -50,7 +50,7 @@ public class BsPartnerPoolPre implements Serializable {
     private Date updateTime;
 
     /**
-     * 状态 1:等待竞选 2:竞选结束 已回退元宝 3: 竞选结束 元宝退回失败
+     * 状态 1:等待竞选 2:竞选成功 3: 竞选失败
      */
     private Integer status;
 
@@ -87,12 +87,12 @@ public class BsPartnerPoolPre implements Serializable {
         this.level = level;
     }
 
-    public String getNum() {
+    public String getLotteryNo() {
-        return num;
+        return lotteryNo;
     }
 
-    public void setNum(String num) {
+    public void setLotteryNo(String lotteryNo) {
-        this.num = num;
+        this.lotteryNo = lotteryNo;
     }
 
     public BigDecimal getGoldCoin() {
@@ -173,7 +173,7 @@ public class BsPartnerPoolPre implements Serializable {
         BsPartnerPoolPre other = (BsPartnerPoolPre) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getLevel() == null ? other.getLevel() == null : this.getLevel().equals(other.getLevel()))
-            && (this.getNum() == null ? other.getNum() == null : this.getNum().equals(other.getNum()))
+            && (this.getLotteryNo() == null ? other.getLotteryNo() == null : this.getLotteryNo().equals(other.getLotteryNo()))
             && (this.getGoldCoin() == null ? other.getGoldCoin() == null : this.getGoldCoin().equals(other.getGoldCoin()))
             && (this.getUserId() == null ? other.getUserId() == null : this.getUserId().equals(other.getUserId()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
@@ -190,7 +190,7 @@ public class BsPartnerPoolPre implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getLevel() == null) ? 0 : getLevel().hashCode());
-        result = prime * result + ((getNum() == null) ? 0 : getNum().hashCode());
+        result = prime * result + ((getLotteryNo() == null) ? 0 : getLotteryNo().hashCode());
         result = prime * result + ((getGoldCoin() == null) ? 0 : getGoldCoin().hashCode());
         result = prime * result + ((getUserId() == null) ? 0 : getUserId().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
@@ -210,7 +210,7 @@ public class BsPartnerPoolPre implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", level=").append(level);
-        sb.append(", num=").append(num);
+        sb.append(", lotteryNo=").append(lotteryNo);
         sb.append(", goldCoin=").append(goldCoin);
         sb.append(", userId=").append(userId);
         sb.append(", createTime=").append(createTime);

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

@@ -246,73 +246,73 @@ public class BsPartnerPoolPreExample {
             return (Criteria) this;
         }
 
-        public Criteria andNumIsNull() {
+        public Criteria andLotteryNoIsNull() {
-            addCriterion("num is null");
+            addCriterion("lottery_no is null");
             return (Criteria) this;
         }
 
-        public Criteria andNumIsNotNull() {
+        public Criteria andLotteryNoIsNotNull() {
-            addCriterion("num is not null");
+            addCriterion("lottery_no is not null");
             return (Criteria) this;
         }
 
-        public Criteria andNumEqualTo(String value) {
+        public Criteria andLotteryNoEqualTo(String value) {
-            addCriterion("num =", value, "num");
+            addCriterion("lottery_no =", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumNotEqualTo(String value) {
+        public Criteria andLotteryNoNotEqualTo(String value) {
-            addCriterion("num <>", value, "num");
+            addCriterion("lottery_no <>", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumGreaterThan(String value) {
+        public Criteria andLotteryNoGreaterThan(String value) {
-            addCriterion("num >", value, "num");
+            addCriterion("lottery_no >", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumGreaterThanOrEqualTo(String value) {
+        public Criteria andLotteryNoGreaterThanOrEqualTo(String value) {
-            addCriterion("num >=", value, "num");
+            addCriterion("lottery_no >=", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumLessThan(String value) {
+        public Criteria andLotteryNoLessThan(String value) {
-            addCriterion("num <", value, "num");
+            addCriterion("lottery_no <", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumLessThanOrEqualTo(String value) {
+        public Criteria andLotteryNoLessThanOrEqualTo(String value) {
-            addCriterion("num <=", value, "num");
+            addCriterion("lottery_no <=", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumLike(String value) {
+        public Criteria andLotteryNoLike(String value) {
-            addCriterion("num like", value, "num");
+            addCriterion("lottery_no like", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumNotLike(String value) {
+        public Criteria andLotteryNoNotLike(String value) {
-            addCriterion("num not like", value, "num");
+            addCriterion("lottery_no not like", value, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumIn(List<String> values) {
+        public Criteria andLotteryNoIn(List<String> values) {
-            addCriterion("num in", values, "num");
+            addCriterion("lottery_no in", values, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumNotIn(List<String> values) {
+        public Criteria andLotteryNoNotIn(List<String> values) {
-            addCriterion("num not in", values, "num");
+            addCriterion("lottery_no not in", values, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumBetween(String value1, String value2) {
+        public Criteria andLotteryNoBetween(String value1, String value2) {
-            addCriterion("num between", value1, value2, "num");
+            addCriterion("lottery_no between", value1, value2, "lotteryNo");
             return (Criteria) this;
         }
 
-        public Criteria andNumNotBetween(String value1, String value2) {
+        public Criteria andLotteryNoNotBetween(String value1, String value2) {
-            addCriterion("num not between", value1, value2, "num");
+            addCriterion("lottery_no not between", value1, value2, "lotteryNo");
             return (Criteria) this;
         }