1

4 changed files with 161 additions and 0 deletions
--- a/service/src/main/java/com/hfkj/dao/BsUserMapper.java
+++ b/service/src/main/java/com/hfkj/dao/BsUserMapper.java
@ -41,6 +41,24 @@ public interface BsUserMapper extends BsUserMapperExt {
    @Insert({
        "insert into bs_user (head_img, `name`, ",
        "phone, grade, wechat_num, ",
+<<<<<<< HEAD
+        "special_id, wechat_open_id, ",
+        "wechat_unionid, elm_pid, ",
+        "invite_user_id, invite_time, ",
+        "partner_level, partner_income_per, ",
+        "`status`, create_time, ",
+        "update_time, ext_1, ",
+        "ext_2, ext_3)",
+        "values (#{headImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
+        "#{phone,jdbcType=VARCHAR}, #{grade,jdbcType=INTEGER}, #{wechatNum,jdbcType=VARCHAR}, ",
+        "#{specialId,jdbcType=VARCHAR}, #{wechatOpenId,jdbcType=VARCHAR}, ",
+        "#{wechatUnionid,jdbcType=VARCHAR}, #{elmPid,jdbcType=VARCHAR}, ",
+        "#{inviteUserId,jdbcType=BIGINT}, #{inviteTime,jdbcType=TIMESTAMP}, ",
+        "#{partnerLevel,jdbcType=INTEGER}, #{partnerIncomePer,jdbcType=DECIMAL}, ",
+        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+=======
        "wechat_open_id, wechat_unionid, ",
        "elm_pid, invite_user_id, ",
        "invite_time, partner_level, ",
@ -55,6 +73,7 @@ public interface BsUserMapper extends BsUserMapperExt {
        "#{partnerIncomePer,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ",
        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
    })
    @Options(useGeneratedKeys=true,keyProperty="id")
    int insert(BsUser record);
@ -71,6 +90,10 @@ public interface BsUserMapper extends BsUserMapperExt {
        @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR),
        @Result(column="grade", property="grade", jdbcType=JdbcType.INTEGER),
        @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR),
+<<<<<<< HEAD
+        @Result(column="special_id", property="specialId", jdbcType=JdbcType.VARCHAR),
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        @Result(column="wechat_open_id", property="wechatOpenId", jdbcType=JdbcType.VARCHAR),
        @Result(column="wechat_unionid", property="wechatUnionid", jdbcType=JdbcType.VARCHAR),
        @Result(column="elm_pid", property="elmPid", jdbcType=JdbcType.VARCHAR),
@ -89,9 +112,15 @@ public interface BsUserMapper extends BsUserMapperExt {

    @Select({
        "select",
+<<<<<<< HEAD
+        "id, head_img, `name`, phone, grade, wechat_num, special_id, wechat_open_id, ",
+        "wechat_unionid, elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, ",
+        "`status`, create_time, update_time, ext_1, ext_2, ext_3",
+=======
        "id, head_img, `name`, phone, grade, wechat_num, wechat_open_id, wechat_unionid, ",
        "elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, `status`, ",
        "create_time, update_time, ext_1, ext_2, ext_3",
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        "from bs_user",
        "where id = #{id,jdbcType=BIGINT}"
    })
@ -102,6 +131,10 @@ public interface BsUserMapper extends BsUserMapperExt {
        @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR),
        @Result(column="grade", property="grade", jdbcType=JdbcType.INTEGER),
        @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR),
+<<<<<<< HEAD
+        @Result(column="special_id", property="specialId", jdbcType=JdbcType.VARCHAR),
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        @Result(column="wechat_open_id", property="wechatOpenId", jdbcType=JdbcType.VARCHAR),
        @Result(column="wechat_unionid", property="wechatUnionid", jdbcType=JdbcType.VARCHAR),
        @Result(column="elm_pid", property="elmPid", jdbcType=JdbcType.VARCHAR),
@ -134,6 +167,10 @@ public interface BsUserMapper extends BsUserMapperExt {
          "phone = #{phone,jdbcType=VARCHAR},",
          "grade = #{grade,jdbcType=INTEGER},",
          "wechat_num = #{wechatNum,jdbcType=VARCHAR},",
+<<<<<<< HEAD
+          "special_id = #{specialId,jdbcType=VARCHAR},",
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
          "wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR},",
          "wechat_unionid = #{wechatUnionid,jdbcType=VARCHAR},",
          "elm_pid = #{elmPid,jdbcType=VARCHAR},",
--- a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java
+++ b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java
@ -48,6 +48,13 @@ public class BsUserSqlProvider {
            sql.VALUES("wechat_num", "#{wechatNum,jdbcType=VARCHAR}");
        }
        
+<<<<<<< HEAD
+        if (record.getSpecialId() != null) {
+            sql.VALUES("special_id", "#{specialId,jdbcType=VARCHAR}");
+        }
+        
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        if (record.getWechatOpenId() != null) {
            sql.VALUES("wechat_open_id", "#{wechatOpenId,jdbcType=VARCHAR}");
        }
@ -115,6 +122,10 @@ public class BsUserSqlProvider {
        sql.SELECT("phone");
        sql.SELECT("grade");
        sql.SELECT("wechat_num");
+<<<<<<< HEAD
+        sql.SELECT("special_id");
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        sql.SELECT("wechat_open_id");
        sql.SELECT("wechat_unionid");
        sql.SELECT("elm_pid");
@ -169,6 +180,13 @@ public class BsUserSqlProvider {
            sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}");
        }
        
+<<<<<<< HEAD
+        if (record.getSpecialId() != null) {
+            sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}");
+        }
+        
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        if (record.getWechatOpenId() != null) {
            sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}");
        }
@ -235,6 +253,10 @@ public class BsUserSqlProvider {
        sql.SET("phone = #{record.phone,jdbcType=VARCHAR}");
        sql.SET("grade = #{record.grade,jdbcType=INTEGER}");
        sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}");
+<<<<<<< HEAD
+        sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}");
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}");
        sql.SET("wechat_unionid = #{record.wechatUnionid,jdbcType=VARCHAR}");
        sql.SET("elm_pid = #{record.elmPid,jdbcType=VARCHAR}");
@ -278,6 +300,13 @@ public class BsUserSqlProvider {
            sql.SET("wechat_num = #{wechatNum,jdbcType=VARCHAR}");
        }
        
+<<<<<<< HEAD
+        if (record.getSpecialId() != null) {
+            sql.SET("special_id = #{specialId,jdbcType=VARCHAR}");
+        }
+        
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        if (record.getWechatOpenId() != null) {
            sql.SET("wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR}");
        }
--- a/service/src/main/java/com/hfkj/entity/BsUser.java
+++ b/service/src/main/java/com/hfkj/entity/BsUser.java
@ -45,6 +45,14 @@ public class BsUser implements Serializable {
    private String wechatNum;

    /**
+<<<<<<< HEAD
+     * 淘宝会员独有
+     */
+    private String specialId;
+
+    /**
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
     * 微信openid
     */
    private String wechatOpenId;
@ -150,6 +158,17 @@ public class BsUser implements Serializable {
        this.wechatNum = wechatNum;
    }

+<<<<<<< HEAD
+    public String getSpecialId() {
+        return specialId;
+    }
+
+    public void setSpecialId(String specialId) {
+        this.specialId = specialId;
+    }
+
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
    public String getWechatOpenId() {
        return wechatOpenId;
    }
@ -253,6 +272,8 @@ public class BsUser implements Serializable {
    public void setExt3(String ext3) {
        this.ext3 = ext3;
    }
+<<<<<<< HEAD
+=======

    @Override
    public boolean equals(Object that) {
@ -342,4 +363,5 @@ public class BsUser implements Serializable {
        sb.append("]");
        return sb.toString();
    }
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
 }
--- a/service/src/main/java/com/hfkj/entity/BsUserExample.java
+++ b/service/src/main/java/com/hfkj/entity/BsUserExample.java
@ -526,6 +526,79 @@ public class BsUserExample {
            return (Criteria) this;
        }

+<<<<<<< HEAD
+        public Criteria andSpecialIdIsNull() {
+            addCriterion("special_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdIsNotNull() {
+            addCriterion("special_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdEqualTo(String value) {
+            addCriterion("special_id =", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdNotEqualTo(String value) {
+            addCriterion("special_id <>", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdGreaterThan(String value) {
+            addCriterion("special_id >", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdGreaterThanOrEqualTo(String value) {
+            addCriterion("special_id >=", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdLessThan(String value) {
+            addCriterion("special_id <", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdLessThanOrEqualTo(String value) {
+            addCriterion("special_id <=", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdLike(String value) {
+            addCriterion("special_id like", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdNotLike(String value) {
+            addCriterion("special_id not like", value, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdIn(List<String> values) {
+            addCriterion("special_id in", values, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdNotIn(List<String> values) {
+            addCriterion("special_id not in", values, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdBetween(String value1, String value2) {
+            addCriterion("special_id between", value1, value2, "specialId");
+            return (Criteria) this;
+        }
+
+        public Criteria andSpecialIdNotBetween(String value1, String value2) {
+            addCriterion("special_id not between", value1, value2, "specialId");
+            return (Criteria) this;
+        }
+
+=======
+>>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
        public Criteria andWechatOpenIdIsNull() {
            addCriterion("wechat_open_id is null");
            return (Criteria) this;