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

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

@@ -56,21 +56,7 @@ public interface BsUserMapper extends BsUserMapperExt {
         "#{partnerLevel,jdbcType=INTEGER}, #{partnerIncomePer,jdbcType=DECIMAL}, ",
         "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
         "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})",
+        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
-        "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}, ",
-        "#{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})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(BsUser record);
@@ -109,9 +95,6 @@ public interface BsUserMapper extends BsUserMapperExt {
         "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",
         "from bs_user",
         "where id = #{id,jdbcType=BIGINT}"
     })

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

@@ -173,9 +173,11 @@ public class BsUserSqlProvider {
         if (record.getWechatNum() != null) {
             sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}");
         }
+        
         if (record.getSpecialId() != null) {
             sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}");
         }
+        
         if (record.getWechatOpenId() != null) {
             sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}");
         }

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

@@ -45,14 +45,11 @@ public class BsUser implements Serializable {
     private String wechatNum;
 
     /**
-<<<<<<< HEAD
      * 淘宝会员独有
      */
     private String specialId;
 
     /**
-=======
->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825
      * 微信openid
      */
     private String wechatOpenId;
@@ -270,7 +267,6 @@ public class BsUser implements Serializable {
         this.ext3 = ext3;
     }
 
-
     @Override
     public boolean equals(Object that) {
         if (this == that) {
@@ -289,6 +285,7 @@ public class BsUser implements Serializable {
             && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone()))
             && (this.getGrade() == null ? other.getGrade() == null : this.getGrade().equals(other.getGrade()))
             && (this.getWechatNum() == null ? other.getWechatNum() == null : this.getWechatNum().equals(other.getWechatNum()))
+            && (this.getSpecialId() == null ? other.getSpecialId() == null : this.getSpecialId().equals(other.getSpecialId()))
             && (this.getWechatOpenId() == null ? other.getWechatOpenId() == null : this.getWechatOpenId().equals(other.getWechatOpenId()))
             && (this.getWechatUnionid() == null ? other.getWechatUnionid() == null : this.getWechatUnionid().equals(other.getWechatUnionid()))
             && (this.getElmPid() == null ? other.getElmPid() == null : this.getElmPid().equals(other.getElmPid()))
@@ -314,6 +311,7 @@ public class BsUser implements Serializable {
         result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode());
         result = prime * result + ((getGrade() == null) ? 0 : getGrade().hashCode());
         result = prime * result + ((getWechatNum() == null) ? 0 : getWechatNum().hashCode());
+        result = prime * result + ((getSpecialId() == null) ? 0 : getSpecialId().hashCode());
         result = prime * result + ((getWechatOpenId() == null) ? 0 : getWechatOpenId().hashCode());
         result = prime * result + ((getWechatUnionid() == null) ? 0 : getWechatUnionid().hashCode());
         result = prime * result + ((getElmPid() == null) ? 0 : getElmPid().hashCode());
@@ -342,6 +340,7 @@ public class BsUser implements Serializable {
         sb.append(", phone=").append(phone);
         sb.append(", grade=").append(grade);
         sb.append(", wechatNum=").append(wechatNum);
+        sb.append(", specialId=").append(specialId);
         sb.append(", wechatOpenId=").append(wechatOpenId);
         sb.append(", wechatUnionid=").append(wechatUnionid);
         sb.append(", elmPid=").append(elmPid);
@@ -359,5 +358,4 @@ public class BsUser implements Serializable {
         sb.append("]");
         return sb.toString();
     }
-
 }