1

hai-service/src/main/java/com/hai/dao/BsIntegralRebateMapper.java

@@ -44,6 +44,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
         "operator_id, operator_name, ",
         "create_time, update_time, ",
         "start_time, end_time, ",
+        "first_distribution, second_distribution, ",
         "`status`, ext_1, ext_2, ",
         "ext_3)",
         "values (#{companyId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}, ",
@@ -51,6 +52,7 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
         "#{operatorId,jdbcType=BIGINT}, #{operatorName,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
         "#{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, ",
+        "#{firstDistribution,jdbcType=DECIMAL}, #{secondDistribution,jdbcType=DECIMAL}, ",
         "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
         "#{ext3,jdbcType=VARCHAR})"
     })
@@ -74,6 +76,8 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="start_time", property="startTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="end_time", property="endTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="first_distribution", property="firstDistribution", jdbcType=JdbcType.DECIMAL),
+        @Result(column="second_distribution", property="secondDistribution", jdbcType=JdbcType.DECIMAL),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@@ -84,7 +88,8 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
     @Select({
         "select",
         "id, company_id, `type`, product_id, percentage, operator_id, operator_name, ",
-        "create_time, update_time, start_time, end_time, `status`, ext_1, ext_2, ext_3",
+        "create_time, update_time, start_time, end_time, first_distribution, second_distribution, ",
+        "`status`, ext_1, ext_2, ext_3",
         "from bs_integral_rebate",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -100,6 +105,8 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="start_time", property="startTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="end_time", property="endTime", jdbcType=JdbcType.TIMESTAMP),
+        @Result(column="first_distribution", property="firstDistribution", jdbcType=JdbcType.DECIMAL),
+        @Result(column="second_distribution", property="secondDistribution", jdbcType=JdbcType.DECIMAL),
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@@ -128,6 +135,8 @@ public interface BsIntegralRebateMapper extends BsIntegralRebateMapperExt {
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
           "start_time = #{startTime,jdbcType=TIMESTAMP},",
           "end_time = #{endTime,jdbcType=TIMESTAMP},",
+          "first_distribution = #{firstDistribution,jdbcType=DECIMAL},",
+          "second_distribution = #{secondDistribution,jdbcType=DECIMAL},",
           "`status` = #{status,jdbcType=INTEGER},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",
           "ext_2 = #{ext2,jdbcType=VARCHAR},",

hai-service/src/main/java/com/hai/dao/BsIntegralRebateSqlProvider.java

@@ -68,6 +68,14 @@ public class BsIntegralRebateSqlProvider {
             sql.VALUES("end_time", "#{endTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getFirstDistribution() != null) {
+            sql.VALUES("first_distribution", "#{firstDistribution,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSecondDistribution() != null) {
+            sql.VALUES("second_distribution", "#{secondDistribution,jdbcType=DECIMAL}");
+        }
+        
         if (record.getStatus() != null) {
             sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
         }
@@ -104,6 +112,8 @@ public class BsIntegralRebateSqlProvider {
         sql.SELECT("update_time");
         sql.SELECT("start_time");
         sql.SELECT("end_time");
+        sql.SELECT("first_distribution");
+        sql.SELECT("second_distribution");
         sql.SELECT("`status`");
         sql.SELECT("ext_1");
         sql.SELECT("ext_2");
@@ -169,6 +179,14 @@ public class BsIntegralRebateSqlProvider {
             sql.SET("end_time = #{record.endTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getFirstDistribution() != null) {
+            sql.SET("first_distribution = #{record.firstDistribution,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSecondDistribution() != null) {
+            sql.SET("second_distribution = #{record.secondDistribution,jdbcType=DECIMAL}");
+        }
+        
         if (record.getStatus() != null) {
             sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         }
@@ -204,6 +222,8 @@ public class BsIntegralRebateSqlProvider {
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         sql.SET("start_time = #{record.startTime,jdbcType=TIMESTAMP}");
         sql.SET("end_time = #{record.endTime,jdbcType=TIMESTAMP}");
+        sql.SET("first_distribution = #{record.firstDistribution,jdbcType=DECIMAL}");
+        sql.SET("second_distribution = #{record.secondDistribution,jdbcType=DECIMAL}");
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
         sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
@@ -258,6 +278,14 @@ public class BsIntegralRebateSqlProvider {
             sql.SET("end_time = #{endTime,jdbcType=TIMESTAMP}");
         }
         
+        if (record.getFirstDistribution() != null) {
+            sql.SET("first_distribution = #{firstDistribution,jdbcType=DECIMAL}");
+        }
+        
+        if (record.getSecondDistribution() != null) {
+            sql.SET("second_distribution = #{secondDistribution,jdbcType=DECIMAL}");
+        }
+        
         if (record.getStatus() != null) {
             sql.SET("`status` = #{status,jdbcType=INTEGER}");
         }

hai-service/src/main/java/com/hai/dao/HighUserMapper.java

@@ -45,16 +45,18 @@ public interface HighUserMapper extends HighUserMapperExt {
         "gold, `status`, open_id, ",
         "open_id_h5, union_id, ",
         "union_open_id, union_union_id, ",
-        "info_complete_status, ext_1, ",
+        "is_agent, info_complete_status, ",
-        "ext_2, ext_3, ext_4)",
+        "ext_1, ext_2, ext_3, ",
+        "ext_4)",
         "values (#{headerImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
         "#{phone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, ",
         "#{sex,jdbcType=VARCHAR}, #{birthdate,jdbcType=DATE}, #{regTime,jdbcType=TIMESTAMP}, ",
         "#{gold,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{openId,jdbcType=VARCHAR}, ",
         "#{openIdH5,jdbcType=VARCHAR}, #{unionId,jdbcType=VARCHAR}, ",
         "#{unionOpenId,jdbcType=VARCHAR}, #{unionUnionId,jdbcType=VARCHAR}, ",
-        "#{infoCompleteStatus,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{isAgent,jdbcType=BIT}, #{infoCompleteStatus,jdbcType=INTEGER}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, #{ext4,jdbcType=VARCHAR})"
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR}, ",
+        "#{ext4,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(HighUser record);
@@ -80,6 +82,7 @@ public interface HighUserMapper extends HighUserMapperExt {
         @Result(column="union_id", property="unionId", jdbcType=JdbcType.VARCHAR),
         @Result(column="union_open_id", property="unionOpenId", jdbcType=JdbcType.VARCHAR),
         @Result(column="union_union_id", property="unionUnionId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_agent", property="isAgent", jdbcType=JdbcType.BIT),
         @Result(column="info_complete_status", property="infoCompleteStatus", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@@ -91,7 +94,7 @@ public interface HighUserMapper extends HighUserMapperExt {
     @Select({
         "select",
         "id, header_img, `name`, phone, `password`, sex, birthdate, reg_time, gold, `status`, ",
-        "open_id, open_id_h5, union_id, union_open_id, union_union_id, info_complete_status, ",
+        "open_id, open_id_h5, union_id, union_open_id, union_union_id, is_agent, info_complete_status, ",
         "ext_1, ext_2, ext_3, ext_4",
         "from high_user",
         "where id = #{id,jdbcType=BIGINT}"
@@ -112,6 +115,7 @@ public interface HighUserMapper extends HighUserMapperExt {
         @Result(column="union_id", property="unionId", jdbcType=JdbcType.VARCHAR),
         @Result(column="union_open_id", property="unionOpenId", jdbcType=JdbcType.VARCHAR),
         @Result(column="union_union_id", property="unionUnionId", jdbcType=JdbcType.VARCHAR),
+        @Result(column="is_agent", property="isAgent", jdbcType=JdbcType.BIT),
         @Result(column="info_complete_status", property="infoCompleteStatus", jdbcType=JdbcType.INTEGER),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR),
@@ -145,6 +149,7 @@ public interface HighUserMapper extends HighUserMapperExt {
           "union_id = #{unionId,jdbcType=VARCHAR},",
           "union_open_id = #{unionOpenId,jdbcType=VARCHAR},",
           "union_union_id = #{unionUnionId,jdbcType=VARCHAR},",
+          "is_agent = #{isAgent,jdbcType=BIT},",
           "info_complete_status = #{infoCompleteStatus,jdbcType=INTEGER},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",
           "ext_2 = #{ext2,jdbcType=VARCHAR},",

hai-service/src/main/java/com/hai/dao/HighUserSqlProvider.java

@@ -84,6 +84,10 @@ public class HighUserSqlProvider {
             sql.VALUES("union_union_id", "#{unionUnionId,jdbcType=VARCHAR}");
         }
         
+        if (record.getIsAgent() != null) {
+            sql.VALUES("is_agent", "#{isAgent,jdbcType=BIT}");
+        }
+        
         if (record.getInfoCompleteStatus() != null) {
             sql.VALUES("info_complete_status", "#{infoCompleteStatus,jdbcType=INTEGER}");
         }
@@ -128,6 +132,7 @@ public class HighUserSqlProvider {
         sql.SELECT("union_id");
         sql.SELECT("union_open_id");
         sql.SELECT("union_union_id");
+        sql.SELECT("is_agent");
         sql.SELECT("info_complete_status");
         sql.SELECT("ext_1");
         sql.SELECT("ext_2");
@@ -210,6 +215,10 @@ public class HighUserSqlProvider {
             sql.SET("union_union_id = #{record.unionUnionId,jdbcType=VARCHAR}");
         }
         
+        if (record.getIsAgent() != null) {
+            sql.SET("is_agent = #{record.isAgent,jdbcType=BIT}");
+        }
+        
         if (record.getInfoCompleteStatus() != null) {
             sql.SET("info_complete_status = #{record.infoCompleteStatus,jdbcType=INTEGER}");
         }
@@ -253,6 +262,7 @@ public class HighUserSqlProvider {
         sql.SET("union_id = #{record.unionId,jdbcType=VARCHAR}");
         sql.SET("union_open_id = #{record.unionOpenId,jdbcType=VARCHAR}");
         sql.SET("union_union_id = #{record.unionUnionId,jdbcType=VARCHAR}");
+        sql.SET("is_agent = #{record.isAgent,jdbcType=BIT}");
         sql.SET("info_complete_status = #{record.infoCompleteStatus,jdbcType=INTEGER}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
         sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}");
@@ -324,6 +334,10 @@ public class HighUserSqlProvider {
             sql.SET("union_union_id = #{unionUnionId,jdbcType=VARCHAR}");
         }
         
+        if (record.getIsAgent() != null) {
+            sql.SET("is_agent = #{isAgent,jdbcType=BIT}");
+        }
+        
         if (record.getInfoCompleteStatus() != null) {
             sql.SET("info_complete_status = #{infoCompleteStatus,jdbcType=INTEGER}");
         }

hai-service/src/main/java/com/hai/entity/BsIntegralRebate.java

@@ -69,6 +69,16 @@ public class BsIntegralRebate implements Serializable {
      */
     private Date endTime;
 
+    /**
+     * 一级分销
+     */
+    private BigDecimal firstDistribution;
+
+    /**
+     * 二级分销
+     */
+    private BigDecimal secondDistribution;
+
     /**
      * 101 正常 102 下架 100 删除
      */
@@ -179,6 +189,22 @@ public class BsIntegralRebate implements Serializable {
         this.endTime = endTime;
     }
 
+    public BigDecimal getFirstDistribution() {
+        return firstDistribution;
+    }
+
+    public void setFirstDistribution(BigDecimal firstDistribution) {
+        this.firstDistribution = firstDistribution;
+    }
+
+    public BigDecimal getSecondDistribution() {
+        return secondDistribution;
+    }
+
+    public void setSecondDistribution(BigDecimal secondDistribution) {
+        this.secondDistribution = secondDistribution;
+    }
+
     public Integer getStatus() {
         return status;
     }
@@ -234,6 +260,8 @@ public class BsIntegralRebate implements Serializable {
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
             && (this.getStartTime() == null ? other.getStartTime() == null : this.getStartTime().equals(other.getStartTime()))
             && (this.getEndTime() == null ? other.getEndTime() == null : this.getEndTime().equals(other.getEndTime()))
+            && (this.getFirstDistribution() == null ? other.getFirstDistribution() == null : this.getFirstDistribution().equals(other.getFirstDistribution()))
+            && (this.getSecondDistribution() == null ? other.getSecondDistribution() == null : this.getSecondDistribution().equals(other.getSecondDistribution()))
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
             && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
@@ -255,6 +283,8 @@ public class BsIntegralRebate implements Serializable {
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
         result = prime * result + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
         result = prime * result + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
+        result = prime * result + ((getFirstDistribution() == null) ? 0 : getFirstDistribution().hashCode());
+        result = prime * result + ((getSecondDistribution() == null) ? 0 : getSecondDistribution().hashCode());
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
         result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
@@ -279,6 +309,8 @@ public class BsIntegralRebate implements Serializable {
         sb.append(", updateTime=").append(updateTime);
         sb.append(", startTime=").append(startTime);
         sb.append(", endTime=").append(endTime);
+        sb.append(", firstDistribution=").append(firstDistribution);
+        sb.append(", secondDistribution=").append(secondDistribution);
         sb.append(", status=").append(status);
         sb.append(", ext1=").append(ext1);
         sb.append(", ext2=").append(ext2);

hai-service/src/main/java/com/hai/entity/BsIntegralRebateExample.java

@@ -796,6 +796,126 @@ public class BsIntegralRebateExample {
             return (Criteria) this;
         }
 
+        public Criteria andFirstDistributionIsNull() {
+            addCriterion("first_distribution is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionIsNotNull() {
+            addCriterion("first_distribution is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionEqualTo(BigDecimal value) {
+            addCriterion("first_distribution =", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionNotEqualTo(BigDecimal value) {
+            addCriterion("first_distribution <>", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionGreaterThan(BigDecimal value) {
+            addCriterion("first_distribution >", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("first_distribution >=", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionLessThan(BigDecimal value) {
+            addCriterion("first_distribution <", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("first_distribution <=", value, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionIn(List<BigDecimal> values) {
+            addCriterion("first_distribution in", values, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionNotIn(List<BigDecimal> values) {
+            addCriterion("first_distribution not in", values, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("first_distribution between", value1, value2, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andFirstDistributionNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("first_distribution not between", value1, value2, "firstDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionIsNull() {
+            addCriterion("second_distribution is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionIsNotNull() {
+            addCriterion("second_distribution is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionEqualTo(BigDecimal value) {
+            addCriterion("second_distribution =", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionNotEqualTo(BigDecimal value) {
+            addCriterion("second_distribution <>", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionGreaterThan(BigDecimal value) {
+            addCriterion("second_distribution >", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionGreaterThanOrEqualTo(BigDecimal value) {
+            addCriterion("second_distribution >=", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionLessThan(BigDecimal value) {
+            addCriterion("second_distribution <", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionLessThanOrEqualTo(BigDecimal value) {
+            addCriterion("second_distribution <=", value, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionIn(List<BigDecimal> values) {
+            addCriterion("second_distribution in", values, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionNotIn(List<BigDecimal> values) {
+            addCriterion("second_distribution not in", values, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("second_distribution between", value1, value2, "secondDistribution");
+            return (Criteria) this;
+        }
+
+        public Criteria andSecondDistributionNotBetween(BigDecimal value1, BigDecimal value2) {
+            addCriterion("second_distribution not between", value1, value2, "secondDistribution");
+            return (Criteria) this;
+        }
+
         public Criteria andStatusIsNull() {
             addCriterion("`status` is null");
             return (Criteria) this;

hai-service/src/main/java/com/hai/entity/HighUser.java

@@ -1,7 +1,5 @@
 package com.hai.entity;
 
-import com.hai.model.UserModel;
-
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,7 +12,7 @@ import java.util.Date;
  * 代码由工具生成
  * 
  **/
-public class HighUser extends UserModel implements Serializable {
+public class HighUser implements Serializable {
     /**
      * 用户编号
      */
@@ -84,6 +82,11 @@ public class HighUser extends UserModel implements Serializable {
      */
     private String unionUnionId;
 
+    /**
+     * 是否代理商
+     */
+    private Boolean isAgent;
+
     /**
      * 用户信息完整状态 
 0：完整   
@@ -222,6 +225,14 @@ public class HighUser extends UserModel implements Serializable {
         this.unionUnionId = unionUnionId;
     }
 
+    public Boolean getIsAgent() {
+        return isAgent;
+    }
+
+    public void setIsAgent(Boolean isAgent) {
+        this.isAgent = isAgent;
+    }
+
     public Integer getInfoCompleteStatus() {
         return infoCompleteStatus;
     }
@@ -289,6 +300,7 @@ public class HighUser extends UserModel implements Serializable {
             && (this.getUnionId() == null ? other.getUnionId() == null : this.getUnionId().equals(other.getUnionId()))
             && (this.getUnionOpenId() == null ? other.getUnionOpenId() == null : this.getUnionOpenId().equals(other.getUnionOpenId()))
             && (this.getUnionUnionId() == null ? other.getUnionUnionId() == null : this.getUnionUnionId().equals(other.getUnionUnionId()))
+            && (this.getIsAgent() == null ? other.getIsAgent() == null : this.getIsAgent().equals(other.getIsAgent()))
             && (this.getInfoCompleteStatus() == null ? other.getInfoCompleteStatus() == null : this.getInfoCompleteStatus().equals(other.getInfoCompleteStatus()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
             && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
@@ -315,6 +327,7 @@ public class HighUser extends UserModel implements Serializable {
         result = prime * result + ((getUnionId() == null) ? 0 : getUnionId().hashCode());
         result = prime * result + ((getUnionOpenId() == null) ? 0 : getUnionOpenId().hashCode());
         result = prime * result + ((getUnionUnionId() == null) ? 0 : getUnionUnionId().hashCode());
+        result = prime * result + ((getIsAgent() == null) ? 0 : getIsAgent().hashCode());
         result = prime * result + ((getInfoCompleteStatus() == null) ? 0 : getInfoCompleteStatus().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
         result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
@@ -344,6 +357,7 @@ public class HighUser extends UserModel implements Serializable {
         sb.append(", unionId=").append(unionId);
         sb.append(", unionOpenId=").append(unionOpenId);
         sb.append(", unionUnionId=").append(unionUnionId);
+        sb.append(", isAgent=").append(isAgent);
         sb.append(", infoCompleteStatus=").append(infoCompleteStatus);
         sb.append(", ext1=").append(ext1);
         sb.append(", ext2=").append(ext2);
@@ -353,4 +367,4 @@ public class HighUser extends UserModel implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-}
+}

hai-service/src/main/java/com/hai/entity/HighUserExample.java

@@ -1152,6 +1152,66 @@ public class HighUserExample {
             return (Criteria) this;
         }
 
+        public Criteria andIsAgentIsNull() {
+            addCriterion("is_agent is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentIsNotNull() {
+            addCriterion("is_agent is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentEqualTo(Boolean value) {
+            addCriterion("is_agent =", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentNotEqualTo(Boolean value) {
+            addCriterion("is_agent <>", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentGreaterThan(Boolean value) {
+            addCriterion("is_agent >", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_agent >=", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentLessThan(Boolean value) {
+            addCriterion("is_agent <", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_agent <=", value, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentIn(List<Boolean> values) {
+            addCriterion("is_agent in", values, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentNotIn(List<Boolean> values) {
+            addCriterion("is_agent not in", values, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_agent between", value1, value2, "isAgent");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAgentNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_agent not between", value1, value2, "isAgent");
+            return (Criteria) this;
+        }
+
         public Criteria andInfoCompleteStatusIsNull() {
             addCriterion("info_complete_status is null");
             return (Criteria) this;