用户数据整理

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -1394,9 +1394,6 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         if (UserType.isMaker(Integer.parseInt(user.getRegisterUserTypeID()))) {
             return;
         }
-        if (UserType.isClub(Integer.parseInt(user.getRegisterUserTypeID()))) {
-            user = cmUserDao.get(user.getCompanyUserID().toString());
-        }
         String status = order.getStatus();//0待确认
         logger.info("----------------------->原余额：" + user.getUserMoney() + "==原可用余额：" + user.getAbleUserMoney());
         //减操作不更新可用余额
@@ -2311,4 +2308,3 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
         newOrderDao.updatePayStatusSon(orderId);
     }
 }
-

src/main/java/com/caimei/modules/user/entity/CmClubinfo.java

@@ -64,15 +64,15 @@ public class CmClubinfo extends DataEntity<CmClubinfo> {
     private String department;  //若为医美分类下的门诊和医院则需要填写科室。
     private String mainpro;    //主打项目
     private String medicalPracticeLicenseImg;  //医美分类必须上传医疗执业许可证
-    private String contractEmail1;  //邮箱
+    private String contractEmail;  //邮箱
     private Integer linkManIdentity;    //联系人身份：1老板，2采购，3运营
 
-    public String getContractEmail1() {
-        return contractEmail1;
+    public String getContractEmail() {
+        return contractEmail;
     }
 
-    public void setContractEmail1(String contractEmail1) {
-        this.contractEmail1 = contractEmail1;
+    public void setContractEmail(String contractEmail) {
+        this.contractEmail = contractEmail;
     }
 
     public String getMedicalPracticeLicenseImg() {

src/main/java/com/caimei/modules/user/entity/CmUser.java

@@ -24,18 +24,18 @@ public class CmUser extends DataEntity<CmUser> {
     private Integer source;         //注册来源: 0网站 1小程序
     private String image;        // image
     private String password;        // 密码
-    private String userLevelID;        // 用户会员等级，见表c_userlevel或枚举UserLevel
+//    private String userLevelID;        // 用户会员等级，见表c_userlevel或枚举UserLevel
     private String name;        // 组织名称
-    private String nick;        // 昵称
-    private String sex;        // 性别
+//    private String nick;        // 昵称
+//    private String sex;        // 性别
     private String registerUserTypeID;        // 用户类型，见表c_usertype或枚举UserType
-    private String manufacturerFlag;        // 已废弃 是否是供应商，1是 空或0否
+//    private String manufacturerFlag;        // 已废弃 是否是供应商，1是 空或0否
     private String manufacturerStatus;        // 供应商状态，见表c_shopstatus或枚举ShopStatus
     private String shopID;        // 供应商Id
-    private String serviceProviderFlag;        // 已废弃  是否创客，1是 空或0否
-    private String clubFlag;        //已废弃  是否会所，1是 空或0否
-    private String masterFlag;        //已废弃  masterFlag
-    private String normalFlag;        //已废弃  normalFlag
+//    private String serviceProviderFlag;        // 已废弃  是否创客，1是 空或0否
+//    private String clubFlag;        //已废弃  是否会所，1是 空或0否
+//    private String masterFlag;        //已废弃  masterFlag
+//    private String normalFlag;        //已废弃  normalFlag
     private String auditStatus;        // auditStatus
     private String auditTime;        // auditTime
     private String auditNote;        // auditNote
@@ -45,42 +45,42 @@ public class CmUser extends DataEntity<CmUser> {
     private String loginFailTime;        // 登录失败次数
     private String loginIP;        // 登录ip
     private String validFlag;        // 用户状态，1正常，0冻结
-    private String emailCheckFlag;        // emailCheckFlag
-    private String mobileCheckFlag;        // mobileCheckFlag
+//    private String emailCheckFlag;        // emailCheckFlag
+//    private String mobileCheckFlag;        // mobileCheckFlag
     private String clubStatus;        // 会所状态，见表c_clubstatus或枚举ClubStatus
     private String clubID;        // 会所Id
     private String agreeFlag;        // agreeFlag
-    private String activationCode;        // activationCode
-    private String activationDate;        // activationDate
+//    private String activationCode;        // activationCode
+//    private String activationDate;        // activationDate
     private String serviceProviderStatus;        // 创客状态
     private String serviceProviderID;        // 创客Id
-    private String masterStatus;        // masterStatus
-    private String masterID;        // masterID
+//    private String masterStatus;        // masterStatus
+//    private String masterID;        // masterID
     private Double userMoney;        // 账户余额
     private Double ableUserMoney;        //账户可用余额
-    private String point;        // point
-    private String shopERPFlag;        // shopERPFlag
-    private String fromUserID;        // 邀请人Id
-    private String fromUserName;        // 邀请人名称
+//    private String point;        // point
+//    private String shopERPFlag;        // shopERPFlag
+//    private String fromUserID;        // 邀请人Id
+//    private String fromUserName;        // 邀请人名称
     private String logoffTime;        // logoffTime
     private String appKey;        // appKey
     private String appSecret;        // appSecret
-    private String sampleFlag;        // sampleFlag
+//    private String sampleFlag;        // sampleFlag
     private String scanFlag;        // 扫描标志(4 CRM拉上来的会所)
-    private String sysroleid;        // sysroleid
-    private String gender;        // gender
-    private String age;        // 年龄
-    private String salerbuyer;        // salerbuyer
-    private String position;        // position
-    private String skill;        // skill
-    private String workage;        // workage
-    private String wechat;        // 微信号
-    private String qq;        // QQ号
-    private String smsFlag;        // 短信是否发送成功
+//    private String sysroleid;        // sysroleid
+//    private String gender;        // gender
+//    private String age;        // 年龄
+//    private String salerbuyer;        // salerbuyer
+//    private String position;        // position
+//    private String skill;        // skill
+//    private String workage;        // workage
+//    private String wechat;        // 微信号
+//    private String qq;        // QQ号
+//    private String smsFlag;        // 短信是否发送成功
     private Integer userBeans;        // 采美豆数量
-    private String privateShopFlag;        // 平台商标志位  0非平台商 1平台商
-    private String privateClubFlag;        // 平台会所标志位  0非平台会所 1平台会所
-    private String isMeiDaoAuthorized;        // isMeiDaoAuthorized
+//    private String privateShopFlag;        // 平台商标志位  0非平台商 1平台商
+//    private String privateClubFlag;        // 平台会所标志位  0非平台会所 1平台会所
+//    private String isMeiDaoAuthorized;        // isMeiDaoAuthorized
     private String guideFlag;        // 引导层弹出  0需要弹出  1不需要弹出
     private String nickName;        // 微信昵称
     private String startTime;     //注册时间开始 查询条件
@@ -94,8 +94,8 @@ public class CmUser extends DataEntity<CmUser> {
     private String account;//账号名： 企业账号登录使用
     private Integer userIdentity;//用户身份
     private String realName;//真实姓名
-    private Integer companyUserID;//企业用户id
-    private String openID;//微信openID
+//    private Integer companyUserID;//企业用户id
+//    private String openID;//微信openID
     private String bindMobile;//企业绑定手机号
     private String tipStatus;//弹窗提示状态
     private String identityDisplay; //前台身份展示
@@ -174,13 +174,13 @@ public class CmUser extends DataEntity<CmUser> {
         this.password = password;
     }
 
-    public String getUserLevelID() {
-        return userLevelID;
-    }
-
-    public void setUserLevelID(String userLevelID) {
-        this.userLevelID = userLevelID;
-    }
+//    public String getUserLevelID() {
+//        return userLevelID;
+//    }
+//
+//    public void setUserLevelID(String userLevelID) {
+//        this.userLevelID = userLevelID;
+//    }
 
     public String getName() {
         return name;
@@ -190,21 +190,21 @@ public class CmUser extends DataEntity<CmUser> {
         this.name = name;
     }
 
-    public String getNick() {
-        return nick;
-    }
-
-    public void setNick(String nick) {
-        this.nick = nick;
-    }
-
-    public String getSex() {
-        return sex;
-    }
+//    public String getNick() {
+//        return nick;
+//    }
+//
+//    public void setNick(String nick) {
+//        this.nick = nick;
+//    }
 
-    public void setSex(String sex) {
-        this.sex = sex;
-    }
+//    public String getSex() {
+//        return sex;
+//    }
+//
+//    public void setSex(String sex) {
+//        this.sex = sex;
+//    }
 
     public String getRegisterUserTypeID() {
         return registerUserTypeID;
@@ -214,14 +214,14 @@ public class CmUser extends DataEntity<CmUser> {
         this.registerUserTypeID = registerUserTypeID;
     }
 
-    @Length(min = 0, max = 1, message = "是否是供应商，1是 空或0否长度必须介于 0 和 1 之间")
-    public String getManufacturerFlag() {
-        return manufacturerFlag;
-    }
-
-    public void setManufacturerFlag(String manufacturerFlag) {
-        this.manufacturerFlag = manufacturerFlag;
-    }
+//    @Length(min = 0, max = 1, message = "是否是供应商，1是 空或0否长度必须介于 0 和 1 之间")
+//    public String getManufacturerFlag() {
+//        return manufacturerFlag;
+//    }
+//
+//    public void setManufacturerFlag(String manufacturerFlag) {
+//        this.manufacturerFlag = manufacturerFlag;
+//    }
 
     @Length(min = 0, max = 11, message = "供应商状态，见表c_shopstatus或枚举ShopStatus长度必须介于 0 和 11 之间")
     public String getManufacturerStatus() {
@@ -241,41 +241,41 @@ public class CmUser extends DataEntity<CmUser> {
         this.shopID = shopID;
     }
 
-    @Length(min = 0, max = 1, message = "是否创客，1是 空或0否长度必须介于 0 和 1 之间")
-    public String getServiceProviderFlag() {
-        return serviceProviderFlag;
-    }
-
-    public void setServiceProviderFlag(String serviceProviderFlag) {
-        this.serviceProviderFlag = serviceProviderFlag;
-    }
-
-    @Length(min = 0, max = 1, message = "是否会所，1是 空或0否长度必须介于 0 和 1 之间")
-    public String getClubFlag() {
-        return clubFlag;
-    }
-
-    public void setClubFlag(String clubFlag) {
-        this.clubFlag = clubFlag;
-    }
-
-    @Length(min = 0, max = 1, message = "masterFlag长度必须介于 0 和 1 之间")
-    public String getMasterFlag() {
-        return masterFlag;
-    }
-
-    public void setMasterFlag(String masterFlag) {
-        this.masterFlag = masterFlag;
-    }
-
-    @Length(min = 0, max = 1, message = "normalFlag长度必须介于 0 和 1 之间")
-    public String getNormalFlag() {
-        return normalFlag;
-    }
-
-    public void setNormalFlag(String normalFlag) {
-        this.normalFlag = normalFlag;
-    }
+//    @Length(min = 0, max = 1, message = "是否创客，1是 空或0否长度必须介于 0 和 1 之间")
+//    public String getServiceProviderFlag() {
+//        return serviceProviderFlag;
+//    }
+//
+//    public void setServiceProviderFlag(String serviceProviderFlag) {
+//        this.serviceProviderFlag = serviceProviderFlag;
+//    }
+
+//    @Length(min = 0, max = 1, message = "是否会所，1是 空或0否长度必须介于 0 和 1 之间")
+//    public String getClubFlag() {
+//        return clubFlag;
+//    }
+//
+//    public void setClubFlag(String clubFlag) {
+//        this.clubFlag = clubFlag;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "masterFlag长度必须介于 0 和 1 之间")
+//    public String getMasterFlag() {
+//        return masterFlag;
+//    }
+//
+//    public void setMasterFlag(String masterFlag) {
+//        this.masterFlag = masterFlag;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "normalFlag长度必须介于 0 和 1 之间")
+//    public String getNormalFlag() {
+//        return normalFlag;
+//    }
+//
+//    public void setNormalFlag(String normalFlag) {
+//        this.normalFlag = normalFlag;
+//    }
 
     @Length(min = 0, max = 1, message = "auditStatus长度必须介于 0 和 1 之间")
     public String getAuditStatus() {
@@ -352,21 +352,21 @@ public class CmUser extends DataEntity<CmUser> {
         this.validFlag = validFlag;
     }
 
-    public String getEmailCheckFlag() {
-        return emailCheckFlag;
-    }
-
-    public void setEmailCheckFlag(String emailCheckFlag) {
-        this.emailCheckFlag = emailCheckFlag;
-    }
-
-    public String getMobileCheckFlag() {
-        return mobileCheckFlag;
-    }
-
-    public void setMobileCheckFlag(String mobileCheckFlag) {
-        this.mobileCheckFlag = mobileCheckFlag;
-    }
+//    public String getEmailCheckFlag() {
+//        return emailCheckFlag;
+//    }
+//
+//    public void setEmailCheckFlag(String emailCheckFlag) {
+//        this.emailCheckFlag = emailCheckFlag;
+//    }
+//
+//    public String getMobileCheckFlag() {
+//        return mobileCheckFlag;
+//    }
+//
+//    public void setMobileCheckFlag(String mobileCheckFlag) {
+//        this.mobileCheckFlag = mobileCheckFlag;
+//    }
 
     public String getClubStatus() {
         return clubStatus;
@@ -392,21 +392,21 @@ public class CmUser extends DataEntity<CmUser> {
         this.agreeFlag = agreeFlag;
     }
 
-    public String getActivationCode() {
-        return activationCode;
-    }
-
-    public void setActivationCode(String activationCode) {
-        this.activationCode = activationCode;
-    }
-
-    public String getActivationDate() {
-        return activationDate;
-    }
-
-    public void setActivationDate(String activationDate) {
-        this.activationDate = activationDate;
-    }
+//    public String getActivationCode() {
+//        return activationCode;
+//    }
+//
+//    public void setActivationCode(String activationCode) {
+//        this.activationCode = activationCode;
+//    }
+//
+//    public String getActivationDate() {
+//        return activationDate;
+//    }
+//
+//    public void setActivationDate(String activationDate) {
+//        this.activationDate = activationDate;
+//    }
 
     @Length(min = 0, max = 11, message = "创客状态长度必须介于 0 和 11 之间")
     public String getServiceProviderStatus() {
@@ -426,23 +426,23 @@ public class CmUser extends DataEntity<CmUser> {
         this.serviceProviderID = serviceProviderID;
     }
 
-    @Length(min = 0, max = 11, message = "masterStatus长度必须介于 0 和 11 之间")
-    public String getMasterStatus() {
-        return masterStatus;
-    }
-
-    public void setMasterStatus(String masterStatus) {
-        this.masterStatus = masterStatus;
-    }
-
-    @Length(min = 0, max = 11, message = "masterID长度必须介于 0 和 11 之间")
-    public String getMasterID() {
-        return masterID;
-    }
-
-    public void setMasterID(String masterID) {
-        this.masterID = masterID;
-    }
+//    @Length(min = 0, max = 11, message = "masterStatus长度必须介于 0 和 11 之间")
+//    public String getMasterStatus() {
+//        return masterStatus;
+//    }
+//
+//    public void setMasterStatus(String masterStatus) {
+//        this.masterStatus = masterStatus;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "masterID长度必须介于 0 和 11 之间")
+//    public String getMasterID() {
+//        return masterID;
+//    }
+//
+//    public void setMasterID(String masterID) {
+//        this.masterID = masterID;
+//    }
 
     public Double getUserMoney() {
         return userMoney;
@@ -460,40 +460,40 @@ public class CmUser extends DataEntity<CmUser> {
         this.ableUserMoney = ableUserMoney;
     }
 
-    @Length(min = 0, max = 11, message = "point长度必须介于 0 和 11 之间")
-    public String getPoint() {
-        return point;
-    }
-
-    public void setPoint(String point) {
-        this.point = point;
-    }
-
-    @Length(min = 0, max = 1, message = "shopERPFlag长度必须介于 0 和 1 之间")
-    public String getShopERPFlag() {
-        return shopERPFlag;
-    }
-
-    public void setShopERPFlag(String shopERPFlag) {
-        this.shopERPFlag = shopERPFlag;
-    }
-
-    @Length(min = 0, max = 11, message = "邀请人Id长度必须介于 0 和 11 之间")
-    public String getFromUserID() {
-        return fromUserID;
-    }
-
-    public void setFromUserID(String fromUserID) {
-        this.fromUserID = fromUserID;
-    }
-
-    public String getFromUserName() {
-        return fromUserName;
-    }
-
-    public void setFromUserName(String fromUserName) {
-        this.fromUserName = fromUserName;
-    }
+//    @Length(min = 0, max = 11, message = "point长度必须介于 0 和 11 之间")
+//    public String getPoint() {
+//        return point;
+//    }
+//
+//    public void setPoint(String point) {
+//        this.point = point;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "shopERPFlag长度必须介于 0 和 1 之间")
+//    public String getShopERPFlag() {
+//        return shopERPFlag;
+//    }
+//
+//    public void setShopERPFlag(String shopERPFlag) {
+//        this.shopERPFlag = shopERPFlag;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "邀请人Id长度必须介于 0 和 11 之间")
+//    public String getFromUserID() {
+//        return fromUserID;
+//    }
+//
+//    public void setFromUserID(String fromUserID) {
+//        this.fromUserID = fromUserID;
+//    }
+//
+//    public String getFromUserName() {
+//        return fromUserName;
+//    }
+//
+//    public void setFromUserName(String fromUserName) {
+//        this.fromUserName = fromUserName;
+//    }
 
     public String getLogoffTime() {
         return logoffTime;
@@ -521,14 +521,14 @@ public class CmUser extends DataEntity<CmUser> {
         this.appSecret = appSecret;
     }
 
-    @Length(min = 0, max = 1, message = "sampleFlag长度必须介于 0 和 1 之间")
-    public String getSampleFlag() {
-        return sampleFlag;
-    }
-
-    public void setSampleFlag(String sampleFlag) {
-        this.sampleFlag = sampleFlag;
-    }
+//    @Length(min = 0, max = 1, message = "sampleFlag长度必须介于 0 和 1 之间")
+//    public String getSampleFlag() {
+//        return sampleFlag;
+//    }
+//
+//    public void setSampleFlag(String sampleFlag) {
+//        this.sampleFlag = sampleFlag;
+//    }
 
     @Length(min = 0, max = 11, message = "扫描标志(4 CRM拉上来的会所)长度必须介于 0 和 11 之间")
     public String getScanFlag() {
@@ -539,94 +539,94 @@ public class CmUser extends DataEntity<CmUser> {
         this.scanFlag = scanFlag;
     }
 
-    @Length(min = 0, max = 11, message = "sysroleid长度必须介于 0 和 11 之间")
-    public String getSysroleid() {
-        return sysroleid;
-    }
-
-    public void setSysroleid(String sysroleid) {
-        this.sysroleid = sysroleid;
-    }
-
-    @Length(min = 0, max = 2, message = "gender长度必须介于 0 和 2 之间")
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    @Length(min = 0, max = 11, message = "年龄长度必须介于 0 和 11 之间")
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    @Length(min = 0, max = 11, message = "salerbuyer长度必须介于 0 和 11 之间")
-    public String getSalerbuyer() {
-        return salerbuyer;
-    }
-
-    public void setSalerbuyer(String salerbuyer) {
-        this.salerbuyer = salerbuyer;
-    }
-
-    @Length(min = 0, max = 128, message = "position长度必须介于 0 和 128 之间")
-    public String getPosition() {
-        return position;
-    }
-
-    public void setPosition(String position) {
-        this.position = position;
-    }
-
-    @Length(min = 0, max = 128, message = "skill长度必须介于 0 和 128 之间")
-    public String getSkill() {
-        return skill;
-    }
-
-    public void setSkill(String skill) {
-        this.skill = skill;
-    }
-
-    public String getWorkage() {
-        return workage;
-    }
-
-    public void setWorkage(String workage) {
-        this.workage = workage;
-    }
-
-    @Length(min = 0, max = 64, message = "微信号长度必须介于 0 和 64 之间")
-    public String getWechat() {
-        return wechat;
-    }
-
-    public void setWechat(String wechat) {
-        this.wechat = wechat;
-    }
-
-    @Length(min = 0, max = 32, message = "QQ号长度必须介于 0 和 32 之间")
-    public String getQq() {
-        return qq;
-    }
-
-    public void setQq(String qq) {
-        this.qq = qq;
-    }
-
-    @Length(min = 0, max = 1, message = "短信是否发送成功长度必须介于 0 和 1 之间")
-    public String getSmsFlag() {
-        return smsFlag;
-    }
-
-    public void setSmsFlag(String smsFlag) {
-        this.smsFlag = smsFlag;
-    }
+//    @Length(min = 0, max = 11, message = "sysroleid长度必须介于 0 和 11 之间")
+//    public String getSysroleid() {
+//        return sysroleid;
+//    }
+//
+//    public void setSysroleid(String sysroleid) {
+//        this.sysroleid = sysroleid;
+//    }
+//
+//    @Length(min = 0, max = 2, message = "gender长度必须介于 0 和 2 之间")
+//    public String getGender() {
+//        return gender;
+//    }
+//
+//    public void setGender(String gender) {
+//        this.gender = gender;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "年龄长度必须介于 0 和 11 之间")
+//    public String getAge() {
+//        return age;
+//    }
+//
+//    public void setAge(String age) {
+//        this.age = age;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "salerbuyer长度必须介于 0 和 11 之间")
+//    public String getSalerbuyer() {
+//        return salerbuyer;
+//    }
+//
+//    public void setSalerbuyer(String salerbuyer) {
+//        this.salerbuyer = salerbuyer;
+//    }
+//
+//    @Length(min = 0, max = 128, message = "position长度必须介于 0 和 128 之间")
+//    public String getPosition() {
+//        return position;
+//    }
+//
+//    public void setPosition(String position) {
+//        this.position = position;
+//    }
+//
+//    @Length(min = 0, max = 128, message = "skill长度必须介于 0 和 128 之间")
+//    public String getSkill() {
+//        return skill;
+//    }
+//
+//    public void setSkill(String skill) {
+//        this.skill = skill;
+//    }
+//
+//    public String getWorkage() {
+//        return workage;
+//    }
+//
+//    public void setWorkage(String workage) {
+//        this.workage = workage;
+//    }
+//
+//    @Length(min = 0, max = 64, message = "微信号长度必须介于 0 和 64 之间")
+//    public String getWechat() {
+//        return wechat;
+//    }
+//
+//    public void setWechat(String wechat) {
+//        this.wechat = wechat;
+//    }
+//
+//    @Length(min = 0, max = 32, message = "QQ号长度必须介于 0 和 32 之间")
+//    public String getQq() {
+//        return qq;
+//    }
+//
+//    public void setQq(String qq) {
+//        this.qq = qq;
+//    }
+//
+//    @Length(min = 0, max = 1, message = "短信是否发送成功长度必须介于 0 和 1 之间")
+//    public String getSmsFlag() {
+//        return smsFlag;
+//    }
+//
+//    public void setSmsFlag(String smsFlag) {
+//        this.smsFlag = smsFlag;
+//    }
 
     @Length(min = 0, max = 11, message = "采美豆数量长度必须介于 0 和 11 之间")
     public Integer getUserBeans() {
@@ -637,32 +637,32 @@ public class CmUser extends DataEntity<CmUser> {
         this.userBeans = userBeans;
     }
 
-    @Length(min = 0, max = 11, message = "平台商标志位  0非平台商 1平台商长度必须介于 0 和 11 之间")
-    public String getPrivateShopFlag() {
-        return privateShopFlag;
-    }
-
-    public void setPrivateShopFlag(String privateShopFlag) {
-        this.privateShopFlag = privateShopFlag;
-    }
-
-    @Length(min = 0, max = 11, message = "平台会所标志位  0非平台会所 1平台会所长度必须介于 0 和 11 之间")
-    public String getPrivateClubFlag() {
-        return privateClubFlag;
-    }
-
-    public void setPrivateClubFlag(String privateClubFlag) {
-        this.privateClubFlag = privateClubFlag;
-    }
-
-    @Length(min = 0, max = 11, message = "isMeiDaoAuthorized长度必须介于 0 和 11 之间")
-    public String getIsMeiDaoAuthorized() {
-        return isMeiDaoAuthorized;
-    }
-
-    public void setIsMeiDaoAuthorized(String isMeiDaoAuthorized) {
-        this.isMeiDaoAuthorized = isMeiDaoAuthorized;
-    }
+//    @Length(min = 0, max = 11, message = "平台商标志位  0非平台商 1平台商长度必须介于 0 和 11 之间")
+//    public String getPrivateShopFlag() {
+//        return privateShopFlag;
+//    }
+//
+//    public void setPrivateShopFlag(String privateShopFlag) {
+//        this.privateShopFlag = privateShopFlag;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "平台会所标志位  0非平台会所 1平台会所长度必须介于 0 和 11 之间")
+//    public String getPrivateClubFlag() {
+//        return privateClubFlag;
+//    }
+//
+//    public void setPrivateClubFlag(String privateClubFlag) {
+//        this.privateClubFlag = privateClubFlag;
+//    }
+//
+//    @Length(min = 0, max = 11, message = "isMeiDaoAuthorized长度必须介于 0 和 11 之间")
+//    public String getIsMeiDaoAuthorized() {
+//        return isMeiDaoAuthorized;
+//    }
+//
+//    public void setIsMeiDaoAuthorized(String isMeiDaoAuthorized) {
+//        this.isMeiDaoAuthorized = isMeiDaoAuthorized;
+//    }
 
     @Length(min = 0, max = 1, message = "引导层弹出  0需要弹出  1不需要弹出长度必须介于 0 和 1 之间")
     public String getGuideFlag() {
@@ -705,21 +705,21 @@ public class CmUser extends DataEntity<CmUser> {
         this.realName = realName;
     }
 
-    public Integer getCompanyUserID() {
-        return companyUserID;
-    }
-
-    public void setCompanyUserID(Integer companyUserID) {
-        this.companyUserID = companyUserID;
-    }
-
-    public String getOpenID() {
-        return openID;
-    }
-
-    public void setOpenID(String openID) {
-        this.openID = openID;
-    }
+//    public Integer getCompanyUserID() {
+//        return companyUserID;
+//    }
+//
+//    public void setCompanyUserID(Integer companyUserID) {
+//        this.companyUserID = companyUserID;
+//    }
+//
+//    public String getOpenID() {
+//        return openID;
+//    }
+//
+//    public void setOpenID(String openID) {
+//        this.openID = openID;
+//    }
 
     public String getBindMobile() {
         return bindMobile;

src/main/java/com/caimei/modules/user/entity/NewCmClub.java

@@ -26,6 +26,7 @@ public class NewCmClub extends DataEntity<NewCmClub> {
     private String searchName;        // 搜索会所名称
     private String searchUserName;        // 搜索
     private String searchBindMobile;        // 搜索绑定手机
+    private String contractEmail;
     private String searchEmail;        // 搜索邮箱
     private Integer searchUserOrganizeID;        // 搜索组织邮箱
     private Integer searchStatus;        // 搜索状态
@@ -448,14 +449,14 @@ public class NewCmClub extends DataEntity<NewCmClub> {
 //        this.wechat1 = wechat1;
 //    }
 //
-//    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
-//    public String getContractEmail1() {
-//        return contractEmail1;
-//    }
-//
-//    public void setContractEmail1(String contractEmail1) {
-//        this.contractEmail1 = contractEmail1;
-//    }
+    @Length(min = 0, max = 50, message = "联系邮箱长度必须介于 0 和 50 之间")
+    public String getContractEmail() {
+        return contractEmail;
+    }
+
+    public void setContractEmail(String contractEmail) {
+        this.contractEmail = contractEmail;
+    }
 //
 //    @Length(min = 0, max = 50, message = "联系人长度必须介于 0 和 50 之间")
 //    public String getLinkMan2() {

src/main/java/com/caimei/modules/user/service/ClubTemporaryService.java

@@ -144,7 +144,7 @@ public class ClubTemporaryService extends CrudService<ClubTemporaryDao, ClubTemp
                 // 机构简称
                 club.setSname(clubTemporary.getShortName());
                 // 邮箱
-                club.setContractEmail1(clubTemporary.getContractEmail());
+                club.setContractEmail(clubTemporary.getContractEmail());
                 // 地址
                 club.setProvinceID(clubTemporary.getProvinceId());
                 club.setCityID(clubTemporary.getCityId());

src/main/java/com/caimei/modules/user/service/CmNormalUserService.java

@@ -45,9 +45,7 @@ public class CmNormalUserService extends CrudService<CmNormalUserDao, CmUser> {
 
     @Transactional(readOnly = false)
     public void unbindWx(CmUser cmUser) {
-        cmUser.setOpenID(null);
         cmNormalUserDao.update(cmUser);
         customerDao.deleteWxUnitByUserId(cmUser.getUserID() + "");
-        customerDao.updateCmBindUserIDAndRegisterTypeIDByOpenid(cmUser.getOpenID());
     }
 }

src/main/java/com/caimei/modules/user/service/CmUserService.java

@@ -81,7 +81,6 @@ public class CmUserService extends CrudService<CmUserDao, CmUser> {
 
     @Transactional(readOnly = false)
     public void unBindClub(CmUser cmUser) {
-        cmUser.setCompanyUserID(null); //置空所属企业用户对应UserID
         cmUser.setName(null);//置空组织名称
         cmUser.setUserIdentity(UserIdentity.NORMAL_USER.getCode());
         cmUser.setUserPermission(UserPermission.NORMAL.getCode());//用户权限改成普通人
@@ -93,7 +92,6 @@ public class CmUserService extends CrudService<CmUserDao, CmUser> {
 
     @Transactional(readOnly = false)
     public void unBindShop(CmUser cmUser) {
-        cmUser.setCompanyUserID(null); //置空所属企业用户对应UserID
         cmUser.setName(null);//置空组织名称
         cmUser.setUserIdentity(UserIdentity.NORMAL_USER.getCode());
         cmUser.setUserPermission(UserPermission.NORMAL.getCode());//用户权限改成普通人
@@ -105,7 +103,6 @@ public class CmUserService extends CrudService<CmUserDao, CmUser> {
 
     @Transactional(readOnly = false)
     public void unBindWeChat(CmUser cmUser) {
-        cmUser.setOpenID(null);//解除与微信的关联
         cmUserDao.update(cmUser);
         List<CmBind> cmbinds = cmBindDao.findCmbindByUserId(cmUser.getUserID());
         CmBind cmbind = cmbinds.get(0);

src/main/java/com/caimei/modules/user/web/CmNormalUserController.java

@@ -97,7 +97,6 @@ public class CmNormalUserController  extends BaseController {
     @RequestMapping("unbindClub")
     public String unBindClub(CmUser cmUser, RedirectAttributes redirectAttributes) {
         //解除与会所的绑定
-        cmUser.setCompanyUserID(null);
         cmUser.setUserIdentity(UserIdentity.NORMAL_USER.getCode());
         cmUser.setUserPermission(UserPermission.NORMAL.getCode());//修改用户权限
         cmUser.setRegisterUserTypeID(UserType.VISITOR.getCode() + "");
@@ -112,7 +111,6 @@ public class CmNormalUserController  extends BaseController {
     @RequestMapping("unbindShop")
     public String unBindShop(CmUser cmUser, RedirectAttributes redirectAttributes) {
         //解除与供应商的绑定
-        cmUser.setCompanyUserID(null);
         cmUser.setUserPermission(1);
         cmUser.setUserIdentity(UserIdentity.NORMAL_USER.getCode());
         cmUser.setRegisterUserTypeID(UserType.VISITOR.getCode() + "");

src/main/java/com/caimei/modules/user/web/CmUserController.java

@@ -94,13 +94,6 @@ public class CmUserController extends BaseController {
                     e.printStackTrace();
                 }
             }
-            if (user.getNick() != null && UrlEncoderUtils.hasUrlEncoded(user.getNick())) {
-                try {
-                    user.setNick(URLDecoder.decode(user.getNick(),"utf-8"));
-                } catch (UnsupportedEncodingException e) {
-                    e.printStackTrace();
-                }
-            }
         }
         //获取组织列表
         List<CmUserOrganize> cmUserOrganizeList = cmUserOrganizeService.findList(new CmUserOrganize());
@@ -187,13 +180,6 @@ public class CmUserController extends BaseController {
                         e.printStackTrace();
                     }
                 }
-                if (user.getNick() != null && UrlEncoderUtils.hasUrlEncoded(user.getNick())) {
-                    try {
-                        user.setNick(URLDecoder.decode(user.getNick(),"utf-8"));
-                    } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                    }
-                }
             }
             Map data = new HashMap<String, Object>();
             data.put("list", list);

src/main/java/com/caimei/modules/user/web/CmUserOrganizeController.java

@@ -336,14 +336,6 @@ public class CmUserOrganizeController extends BaseController {
             newCmClub.setScanFlag("2");
             newCmClub.setFlag("0");
             newCmClub.setAddTime(currentDate);
-            newCmClub.setLinkMan1(newCmClub.getLinkMan());
-            newCmClub.setContractMobile1(newCmClub.getContractMobile());
-//			newCmClub.setStatus(ClubStatus.ONLINE.getCode());
-            newCmClub.setPayFlag1(AppKeys.FLAG_NO);
-            newCmClub.setLevel(0d);
-            newCmClub.setSubClubCount(0);
-            newCmClub.setFavoriteTimes(0);
-            newCmClub.setClubTypeID(1);
             newCmClub.setDefaultServiceProviderUpdTime(DateTimeUtil.getCurrentDateTime());
 
             newCmClubService.insert(newCmClub);
@@ -351,8 +343,6 @@ public class CmUserOrganizeController extends BaseController {
             //更新用户绑定关系
             cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
             String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
-            cmUser.setNick(nick);
-            cmUser.setCompanyUserID(cmUser.getUserID());
 
             //更新会所绑定关系
             newCmClub.setUserID(cmUser.getUserID());
@@ -394,17 +384,12 @@ public class CmUserOrganizeController extends BaseController {
         cmUser.setPassword(MD5Util.MD5("caimei123"));
         cmUser.setBindMobile(newCmClub.getContractMobile());
         cmUser.setUserName(newCmClub.getName());
-        cmUser.setEmailCheckFlag("0");
-        cmUser.setMobileCheckFlag("0");
         cmUser.setUserMoney(0d);
         cmUser.setAbleUserMoney(0d);
-        cmUser.setPoint("0");
-        cmUser.setShopERPFlag("0");
         cmUser.setUserBeans(0);
         cmUser.setValidFlag("1");
         cmUser.setAgreeFlag("1");
         cmUser.setLoginFailTime("0");
-        cmUser.setUserLevelID("1");
         cmUser.setScanFlag("2");
         cmUser.setUserPermission(2);
         return cmUser;

src/main/java/com/caimei/modules/user/web/NewCmClubController.java

@@ -206,7 +206,6 @@ public class NewCmClubController extends BaseController {
                 //更新会所信息
                 NewCmClub newCmClub = newCmClubService.get(cmUser.getClubID());
                 newCmClub.setContractMobile(mobile);
-                newCmClub.setContractMobile1(mobile);
                 newCmClubService.update(newCmClub);
 
                 //更新会所用户信息

src/main/java/com/caimei/modules/user/web/NewCmShopController.java

@@ -336,7 +336,6 @@ public class NewCmShopController extends BaseController {
                 //更新供应商信息
                 NewCmShop newCmShop = newCmShopService.get(cmUser.getShopID());
                 newCmShop.setContractMobile(mobile);
-                newCmShop.setContractMobile1(mobile);
                 newCmShopService.update(newCmShop);
                 //更新企业用户
                 cmUser.setBindMobile(mobile);
@@ -425,14 +424,13 @@ public class NewCmShopController extends BaseController {
 
     /**
      * @param cmShop
-     * @param flag               0 设置分类   1 修改分类
      * @param redirectAttributes
      * @return
      */
     @RequiresPermissions("user:newCmShop:edit")
     @RequestMapping(value = "editShopType")
     @ResponseBody
-    public JsonModel editShopType(NewCmShop cmShop, String flagC, RedirectAttributes redirectAttributes) {
+    public JsonModel editShopType(NewCmShop cmShop, RedirectAttributes redirectAttributes) {
         JsonModel jsonModel = JsonModel.newInstance();
         if (cmShop.getShopID() == null) {
             return jsonModel.error("请求参数异常");

src/main/java/com/caimei/modules/user/web/newUser/AgencyController.java

@@ -279,7 +279,6 @@ public class AgencyController extends BaseController {
 
         cmClubinfo.setContractPhone(newCmClub.getContractPhone());
         cmClubinfo.setFax(newCmClub.getFax());
-        cmClubinfo.setEmpnum(newCmClub.getEmpnum());
         cmClubinfo.setInfo(newCmClub.getInfo());
         cmClubinfo.setBusinessLicenseImage(newCmClub.getBusinessLicenseImage());
         cmClubinfo.setHeadpic(newCmClub.getHeadpic());
@@ -293,7 +292,7 @@ public class AgencyController extends BaseController {
         cmClubinfo.setDepartment(newCmClub.getDepartment());
         cmClubinfo.setMainpro(newCmClub.getMainpro());
         cmClubinfo.setMedicalPracticeLicenseImg(newCmClub.getMedicalPracticeLicenseImg());
-        cmClubinfo.setContractEmail1(newCmClub.getContractEmail1());
+        cmClubinfo.setContractEmail(newCmClub.getContractEmail());
         cmClubinfo.setLinkManIdentity(newCmClub.getLinkManIdentity());
 
         model.addAttribute("cmClubinfo", cmClubinfo);
@@ -380,22 +379,20 @@ public class AgencyController extends BaseController {
         newCmClub.setAddress(cmClubinfo.getAddress());
         newCmClub.setContractPhone(cmClubinfo.getContractPhone());
         newCmClub.setFax(cmClubinfo.getFax());
-        newCmClub.setEmpnum(cmClubinfo.getEmpnum());
         newCmClub.setInfo(cmClubinfo.getInfo());
         newCmClub.setFirstClubType(cmClubinfo.getFirstClubType());
         newCmClub.setSecondClubType(cmClubinfo.getSecondClubType());
         newCmClub.setDepartment(cmClubinfo.getDepartment());
         newCmClub.setMainpro(cmClubinfo.getMainpro());
-        newCmClub.setContractEmail1(cmClubinfo.getContractEmail1());
+        newCmClub.setContractEmail(cmClubinfo.getContractEmail());
         newCmClub.setContractMobile(bindMobile);
         newCmClub.setLinkMan(userName);
         newCmClub.setLinkManIdentity(cmClubinfo.getLinkManIdentity());
-        newCmClub.setLinkMan1(userName);
         newCmClub.setName(name);
         newCmClub.setSname(cmClubinfo.getSname());
         CmUser user = new CmUser();
         user.setUserID(newCmClub.getUserID());
-        user.setEmail(cmClubinfo.getContractEmail1());
+        user.setEmail(cmClubinfo.getContractEmail());
         user.setName(name);
         user.setUserName(userName);
         user.setBindMobile(bindMobile);
@@ -516,21 +513,6 @@ public class AgencyController extends BaseController {
                 userPermission = 2;
                 status = "90";
                 auditStatus = "1";
-                // 如果该机构有邀请者,并且邀请者是已上线的服务商,则将该服务商设置为该机构的定点服务商
-                //设置协销
-                if (StringUtils.isNotBlank(companyUser.getFromUserID())) {
-                    CmUser fromUser = cmUserService.get(companyUser.getFromUserID() + "");
-                    //协销已上线
-                    if (null != fromUser && fromUser.getRegisterUserTypeID().equals("2") && StringUtils.isNotBlank(fromUser.getServiceProviderID()) && fromUser.getServiceProviderStatus().equals("90")) {
-                        // 获取协销经理ID
-                        NewCmSp newCmSp = cmSpService.get(fromUser.getServiceProviderID());
-                        newCmClub.setDefaultServiceProviderID(Integer.parseInt(fromUser.getServiceProviderID()));
-                        newCmClub.setSpID(Integer.parseInt(fromUser.getServiceProviderID()));
-                        newCmClub.setMainServiceProviderID(newCmSp.getMainServiceProviderID());
-                        newCmClub.setDefaultServiceProviderUpdTime(DateUtils.getDateTime());
-                        newCmClub.setFirstServiceProviderFlag("1");
-                    }
-                }
                 companyUser.setRegisterUserTypeID("3");
                 companyUser.setUserPermission(userPermission);
                 //审核通过升级为会员机构

src/main/java/com/caimei/modules/weisha/web/CmMallOrganizeController.java

@@ -92,7 +92,6 @@ public class CmMallOrganizeController extends BaseController {
         }
         //判断该会所手机号是否已存在
         cmUser.setBindMobile(cmMallOrganize.getMobile());
-        newCmClub.setCheckTime(null);
         List<CmUser> listBuyBindMobile = cmUserService.findListBuyBindMobile(cmUser);
         if (CollectionUtils.isNotEmpty(listBuyBindMobile) && listBuyBindMobile.size() > 0) {
             addMessage(model, "手机号重复，请更换手机号");
@@ -128,7 +127,6 @@ public class CmMallOrganizeController extends BaseController {
                 cmUser.setAbleUserMoney(0d);
                 cmUser.setValidFlag("1");
                 cmUser.setAgreeFlag("1");
-                cmUser.setUserLevelID("1");
                 cmUser.setUserPermission(5);
                 cmUserService.insert(cmUser);//插入新的用户数据
             }
@@ -140,20 +138,12 @@ public class CmMallOrganizeController extends BaseController {
                 newCmClub.setSpID(AppKeys.DEFAULT_SPID);
                 newCmClub.setMainServiceProviderID(AppKeys.DEFAULT_SPID);
                 newCmClub.setAddTime(currentDate);
-                newCmClub.setLinkMan1(newCmClub.getLinkMan());
-                newCmClub.setContractMobile1(newCmClub.getContractMobile());
-                newCmClub.setLevel(0d);
-                newCmClub.setSubClubCount(0);
-                newCmClub.setFavoriteTimes(0);
-                newCmClub.setClubTypeID(1);
                 newCmClub.setDefaultServiceProviderUpdTime(currentDate);
                 newCmClubService.insert(newCmClub);
 
                 //更新用户绑定关系
                 cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
                 String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
-                cmUser.setNick(nick);
-                cmUser.setCompanyUserID(cmUser.getUserID());
 
                 //更新会所绑定关系
                 newCmClub.setUserID(cmUser.getUserID());

src/main/java/com/caimei/modules/weisha/web/CmOrganizeClubController.java

@@ -145,7 +145,6 @@ public class CmOrganizeClubController extends BaseController {
                 cmUser.setAbleUserMoney(0d);
                 cmUser.setValidFlag("1");
                 cmUser.setAgreeFlag("1");
-                cmUser.setUserLevelID("1");
                 cmUser.setUserPermission(5);
                 cmUserService.insert(cmUser);//插入新的用户数据
             }
@@ -157,20 +156,12 @@ public class CmOrganizeClubController extends BaseController {
                 newCmClub.setSpID(AppKeys.DEFAULT_SPID);
                 newCmClub.setMainServiceProviderID(AppKeys.DEFAULT_SPID);
                 newCmClub.setAddTime(currentDate);
-                newCmClub.setLinkMan1(newCmClub.getLinkMan());
-                newCmClub.setContractMobile1(newCmClub.getContractMobile());
-                newCmClub.setLevel(0d);
-                newCmClub.setSubClubCount(0);
-                newCmClub.setFavoriteTimes(0);
-                newCmClub.setClubTypeID(1);
                 newCmClub.setDefaultServiceProviderUpdTime(currentDate);
                 newCmClubService.insert(newCmClub);
 
                 //更新用户绑定关系
                 cmUser.setClubID(String.valueOf(newCmClub.getClubID()));
                 String nick = cmUser.getUserID() + "_" + RandomCodeGenerator.generateCodeString(4).toLowerCase();
-                cmUser.setNick(nick);
-                cmUser.setCompanyUserID(cmUser.getUserID());
 
                 //更新会所绑定关系
                 newCmClub.setUserID(cmUser.getUserID());

src/main/resources/mappings/modules/user/CmNormalUserMapper.xml

@@ -180,25 +180,15 @@
 		  	realName = #{realName},
 		  	userPermission = #{userPermission},
 		  	userIdentity = #{userIdentity},
-		  	companyUserID = #{companyUserID},
-		  	openID = #{openID},
 			mobile = #{mobile},
 			email = #{email},
 			userName = #{userName},
 			image = #{image},
 			password = #{password},
-			userLevelID = #{userLevelID},
 			name = #{name},
-			nick = #{nick},
-			sex = #{sex},
 			registerUserTypeID = #{registerUserTypeID},
-			manufacturerFlag = #{manufacturerFlag},
 			manufacturerStatus = #{manufacturerStatus},
 			shopID = #{shopID},
-			serviceProviderFlag = #{serviceProviderFlag},
-			clubFlag = #{clubFlag},
-			masterFlag = #{masterFlag},
-			normalFlag = #{normalFlag},
 			auditStatus = #{auditStatus},
 			auditTime = #{auditTime},
 			auditNote = #{auditNote},
@@ -208,41 +198,17 @@
 			loginFailTime = #{loginFailTime},
 			loginIP = #{loginIP},
 			validFlag = #{validFlag},
-			emailCheckFlag = #{emailCheckFlag},
-			mobileCheckFlag = #{mobileCheckFlag},
 			clubStatus = #{clubStatus},
 			clubID = #{clubID},
 			agreeFlag = #{agreeFlag},
-			activationCode = #{activationCode},
-			activationDate = #{activationDate},
 			serviceProviderStatus = #{serviceProviderStatus},
 			serviceProviderID = #{serviceProviderID},
-			masterStatus = #{masterStatus},
-			masterID = #{masterID},
 			userMoney = #{userMoney},
-			point = #{point},
-			shopERPFlag = #{shopERPFlag},
-			fromUserID = #{fromUserID},
-			fromUserName = #{fromUserName},
 			logoffTime = #{logoffTime},
 			appKey = #{appKey},
 			appSecret = #{appSecret},
-			sampleFlag = #{sampleFlag},
 			scanFlag = #{scanFlag},
-			sysroleid = #{sysroleid},
-			gender = #{gender},
-			age = #{age},
-			salerbuyer = #{salerbuyer},
-			position = #{position},
-			skill = #{skill},
-			workage = #{workage},
-			wechat = #{wechat},
-			qq = #{qq},
-			smsFlag = #{smsFlag},
 			userBeans = #{userBeans},
-			privateShopFlag = #{privateShopFlag},
-			privateClubFlag = #{privateClubFlag},
-			isMeiDaoAuthorized = #{isMeiDaoAuthorized},
 			guideFlag = #{guideFlag}
 		WHERE userID = #{userID}
 	</update>

src/main/resources/mappings/modules/user/CmUserMapper.xml

@@ -11,24 +11,14 @@
 		a.account AS "account",
 		a.realName AS "realName",
 		a.userIdentity AS "userIdentity",
-		a.companyUserID AS "companyUserID",
-		a.openID AS "openID",
 		a.userName AS "userName",
 		a.source AS "source",
 		a.image AS "image",
 		a.password AS "password",
-		a.userLevelID AS "userLevelID",
 		a.name AS "name",
-		a.nick AS "nick",
-		a.sex AS "sex",
 		a.registerUserTypeID AS "registerUserTypeID",
-		a.manufacturerFlag AS "manufacturerFlag",
 		a.manufacturerStatus AS "manufacturerStatus",
 		a.shopID AS "shopID",
-		a.serviceProviderFlag AS "serviceProviderFlag",
-		a.clubFlag AS "clubFlag",
-		a.masterFlag AS "masterFlag",
-		a.normalFlag AS "normalFlag",
 		a.auditStatus AS "auditStatus",
 		a.auditTime AS "auditTime",
 		a.auditNote AS "auditNote",
@@ -38,54 +28,26 @@
 		a.loginFailTime AS "loginFailTime",
 		a.loginIP AS "loginIP",
 		a.validFlag AS "validFlag",
-		a.emailCheckFlag AS "emailCheckFlag",
-		a.mobileCheckFlag AS "mobileCheckFlag",
 		a.clubStatus AS "clubStatus",
 		a.clubID AS "clubID",
 		a.agreeFlag AS "agreeFlag",
-		a.activationCode AS "activationCode",
-		a.activationDate AS "activationDate",
 		a.serviceProviderStatus AS "serviceProviderStatus",
 		a.serviceProviderID AS "serviceProviderID",
-		a.masterStatus AS "masterStatus",
-		a.masterID AS "masterID",
 		a.userMoney AS "userMoney",
 		a.ableUserMoney as "ableUserMoney",
-		a.point AS "point",
-		a.shopERPFlag AS "shopERPFlag",
-		a.fromUserID AS "fromUserID",
-		a.fromUserName AS "fromUserName",
 		a.logoffTime AS "logoffTime",
 		a.appKey AS "appKey",
 		a.appSecret AS "appSecret",
-		a.sampleFlag AS "sampleFlag",
 		a.scanFlag AS "scanFlag",
-		a.sysroleid AS "sysroleid",
-		a.gender AS "gender",
-		a.age AS "age",
-		a.salerbuyer AS "salerbuyer",
-		a.position AS "position",
-		a.skill AS "skill",
-		a.workage AS "workage",
-		a.wechat AS "wechat",
-		a.qq AS "qq",
-		a.smsFlag AS "smsFlag",
 		a.userBeans AS "userBeans",
-		a.privateShopFlag AS "privateShopFlag",
-		a.privateClubFlag AS "privateClubFlag",
-		a.isMeiDaoAuthorized AS "isMeiDaoAuthorized",
 		a.guideFlag AS "guideFlag",
 		a.userPermission AS "userPermission"
 	</sql>
 
-    <sql id="cmUserJoins">
-    </sql>
-
     <select id="get" resultType="CmUser">
         SELECT
         <include refid="cmUserColumns"/>
         FROM user a
-        <include refid="cmUserJoins"/>
         WHERE a.userID = #{id}
     </select>
 
@@ -93,7 +55,6 @@
         SELECT
         <include refid="cmUserColumns"/>
         FROM user a
-        <include refid="cmUserJoins"/>
         <where>
 
             <if test="userID != null and userID != ''">
@@ -139,9 +100,6 @@
                     AND a.registerUserTypeID IN (0,10,1,24,34,2,32,3,23,33)
                 </otherwise>
             </choose>
-            <!--<if test="registerUserTypeID != null and registerUserTypeID != ''">-->
-            <!--AND a.registerUserTypeID = #{registerUserTypeID}-->
-            <!--</if>-->
         </where>
         <choose>
             <when test="page !=null and page.orderBy != null and page.orderBy != ''">
@@ -208,7 +166,6 @@
         SELECT
         <include refid="cmUserColumns"/>
         FROM user a
-        <include refid="cmUserJoins"/>
         <where>
 
         </where>
@@ -228,8 +185,6 @@
 			account,
 		  	realName,
 		  	userIdentity,
-		  	companyUserID,
-		  	openID,
 			mobile,
 			bindMobile,
 			userPermission,
@@ -238,18 +193,10 @@
 			source,
 			image,
 			password,
-			userLevelID,
 			name,
-			nick,
-			sex,
 			registerUserTypeID,
-			manufacturerFlag,
 			manufacturerStatus,
 			shopID,
-			serviceProviderFlag,
-			clubFlag,
-			masterFlag,
-			normalFlag,
 			auditStatus,
 			auditTime,
 			auditNote,
@@ -259,51 +206,25 @@
 			loginFailTime,
 			loginIP,
 			validFlag,
-			emailCheckFlag,
-			mobileCheckFlag,
 			clubStatus,
 			<if test="clubID != null and clubID != ''">
 			clubID,
 			</if>
 			agreeFlag,
-			activationCode,
-			activationDate,
 			serviceProviderStatus,
 			serviceProviderID,
-			masterStatus,
-			masterID,
 			userMoney,
 			ableUserMoney,
-			point,
-			shopERPFlag,
-			fromUserID,
-			fromUserName,
 			logoffTime,
 			appKey,
 			appSecret,
-			sampleFlag,
 			scanFlag,
-			sysroleid,
-			gender,
-			age,
-			salerbuyer,
-			position,
-			skill,
-			workage,
-			wechat,
-			qq,
-			smsFlag,
-			userBeans,
-			privateShopFlag,
-			privateClubFlag,
-			isMeiDaoAuthorized
+			userBeans
 		) VALUES (
 			#{userOrganizeID},
 			#{account},
 		  	#{realName},
 		  	#{userIdentity},
-		  	#{companyUserID},
-		  	#{openID},
 			#{mobile},
 			#{bindMobile},
 			#{userPermission},
@@ -312,18 +233,10 @@
 			#{source},
 			#{image},
 			#{password},
-			#{userLevelID},
 			#{name},
-			#{nick},
-			#{sex},
 			#{registerUserTypeID},
-			#{manufacturerFlag},
 			#{manufacturerStatus},
 			#{shopID},
-			#{serviceProviderFlag},
-			#{clubFlag},
-			#{masterFlag},
-			#{normalFlag},
 			#{auditStatus},
 			#{auditTime},
 			#{auditNote},
@@ -333,44 +246,20 @@
 			#{loginFailTime},
 			#{loginIP},
 			#{validFlag},
-			#{emailCheckFlag},
-			#{mobileCheckFlag},
 			#{clubStatus},
 			<if test="clubID != null and clubID != ''">
 			#{clubID},
 			</if>
 			#{agreeFlag},
-			#{activationCode},
-			#{activationDate},
 			#{serviceProviderStatus},
 			#{serviceProviderID},
-			#{masterStatus},
-			#{masterID},
 			#{userMoney},
 			#{ableUserMoney},
-			#{point},
-			#{shopERPFlag},
-			#{fromUserID},
-			#{fromUserName},
 			#{logoffTime},
 			#{appKey},
 			#{appSecret},
-			#{sampleFlag},
 			#{scanFlag},
-			#{sysroleid},
-			#{gender},
-			#{age},
-			#{salerbuyer},
-			#{position},
-			#{skill},
-			#{workage},
-			#{wechat},
-			#{qq},
-			#{smsFlag},
-			#{userBeans},
-			#{privateShopFlag},
-			#{privateClubFlag},
-			#{isMeiDaoAuthorized}
+			#{userBeans}
 		)
 	</insert>
 
@@ -388,12 +277,6 @@
 		<if test="userIdentity != null and userIdentity != ''">
 			userIdentity = #{userIdentity},
 		  	</if>
-		<if test="companyUserID != null and companyUserID != ''">
-			companyUserID = #{companyUserID},
-		  	</if>
-		<if test="openID != null and openID != ''">
-			openID = #{openID},
-			</if>
 		<if test="mobile != null and mobile != ''">
 			mobile = #{mobile},
 			</if>
@@ -412,42 +295,18 @@
 		<if test="password != null and password != ''">
 			password = #{password},
 			</if>
-		<if test="userLevelID != null and userLevelID != ''">
-			userLevelID = #{userLevelID},
-			</if>
 		<if test="name != null and name != ''">
 			name = #{name},
 			</if>
-		<if test="nick != null and nick != ''">
-			nick = #{nick},
-			</if>
-		<if test="sex != null and sex != ''">
-			sex = #{sex},
-			</if>
 		<if test="registerUserTypeID != null and registerUserTypeID != ''">
 			registerUserTypeID = #{registerUserTypeID},
 			</if>
-		<if test="manufacturerFlag != null and manufacturerFlag != ''">
-			manufacturerFlag = #{manufacturerFlag},
-			</if>
 		<if test="manufacturerStatus != null and manufacturerStatus != ''">
 			manufacturerStatus = #{manufacturerStatus},
 			</if>
 		<if test="shopID != null and shopID != ''">
 			shopID = #{shopID},
 			</if>
-		<if test="serviceProviderFlag != null and serviceProviderFlag != ''">
-			serviceProviderFlag = #{serviceProviderFlag},
-			</if>
-		<if test="clubFlag != null and clubFlag != ''">
-			clubFlag = #{clubFlag},
-			</if>
-		<if test="masterFlag != null and masterFlag != ''">
-			masterFlag = #{masterFlag},
-			</if>
-		<if test="normalFlag != null and normalFlag != ''">
-			normalFlag = #{normalFlag},
-			</if>
 		<if test="auditStatus != null and auditStatus != ''">
 			auditStatus = #{auditStatus},
 			</if>
@@ -475,12 +334,6 @@
 		<if test="validFlag != null and validFlag != ''">
 			validFlag = #{validFlag},
 			</if>
-		<if test="emailCheckFlag != null and emailCheckFlag != ''">
-			emailCheckFlag = #{emailCheckFlag},
-			</if>
-		<if test="mobileCheckFlag != null and mobileCheckFlag != ''">
-			mobileCheckFlag = #{mobileCheckFlag},
-			</if>
 		<if test="clubStatus != null and clubStatus != ''">
 			clubStatus = #{clubStatus},
 			</if>
@@ -490,39 +343,15 @@
 		<if test="agreeFlag != null and agreeFlag != ''">
 			agreeFlag = #{agreeFlag},
 			</if>
-		<if test="activationCode != null and activationCode != ''">
-			activationCode = #{activationCode},
-			</if>
-		<if test="activationDate != null ">
-			activationDate = #{activationDate},
-			</if>
 		<if test="serviceProviderStatus != null and serviceProviderStatus != ''">
 			serviceProviderStatus = #{serviceProviderStatus},
 			</if>
 		<if test="serviceProviderID != null and serviceProviderID != ''">
 			serviceProviderID = #{serviceProviderID},
 			</if>
-		<if test="masterStatus != null and masterStatus != ''">
-			masterStatus = #{masterStatus},
-			</if>
-		<if test="masterID != null and masterID != ''">
-			masterID = #{masterID},
-			</if>
 		<if test="userMoney != null and userMoney != ''">
 			userMoney = #{userMoney},
 			</if>
-		<if test="point != null and point != ''">
-			point = #{point},
-			</if>
-		<if test="shopERPFlag != null and shopERPFlag != ''">
-			shopERPFlag = #{shopERPFlag},
-			</if>
-		<if test="fromUserID != null and fromUserID != ''">
-			fromUserID = #{fromUserID},
-			</if>
-		<if test="fromUserName != null and fromUserName != ''">
-			fromUserName = #{fromUserName},
-			</if>
 		<if test="logoffTime != null and logoffTime != ''">
 			logoffTime = #{logoffTime},
 			</if>
@@ -532,54 +361,12 @@
 		<if test="appSecret != null and appSecret != ''">
 			appSecret = #{appSecret},
 			</if>
-		<if test="sampleFlag != null and sampleFlag != ''">
-			sampleFlag = #{sampleFlag},
-			</if>
 		<if test="scanFlag != null and scanFlag != ''">
 			scanFlag = #{scanFlag},
 			</if>
-		<if test="sysroleid != null and sysroleid != ''">
-			sysroleid = #{sysroleid},
-			</if>
-		<if test="gender != null and gender != ''">
-			gender = #{gender},
-			</if>
-		<if test="age != null and age != ''">
-			age = #{age},
-			</if>
-		<if test="salerbuyer != null and salerbuyer != ''">
-			salerbuyer = #{salerbuyer},
-			</if>
-		<if test="position != null and position != ''">
-			position = #{position},
-			</if>
-		<if test="skill != null and skill != ''">
-			skill = #{skill},
-			</if>
-		<if test="workage != null and workage != ''">
-			workage = #{workage},
-			</if>
-		<if test="wechat != null and wechat != ''">
-			wechat = #{wechat},
-			</if>
-		<if test="qq != null and qq != ''">
-			qq = #{qq},
-			</if>
-		<if test="smsFlag != null and smsFlag != ''">
-			smsFlag = #{smsFlag},
-			</if>
 		<if test="userBeans != null and userBeans != ''">
 			userBeans = #{userBeans},
 			</if>
-		<if test="privateShopFlag != null and privateShopFlag != ''">
-			privateShopFlag = #{privateShopFlag},
-			</if>
-		<if test="privateClubFlag != null and privateClubFlag != ''">
-			privateClubFlag = #{privateClubFlag},
-			</if>
-		<if test="isMeiDaoAuthorized != null and isMeiDaoAuthorized != ''">
-			isMeiDaoAuthorized = #{isMeiDaoAuthorized},
-			</if>
 		<if test="guideFlag != null and guideFlag != ''">
 			guideFlag = #{guideFlag},
 		</if>
@@ -614,8 +401,7 @@
         SELECT
         <include refid="cmUserColumns"/>
         FROM user a
-        WHERE
-        a.companyUserID=#{companyUserID} AND a.userID != #{companyUserID}
+        WHERE a.userID != #{companyUserID}
         ORDER BY case when registerUserTypeID in (1,2,3) then 1 else 0 end ,
         case when registerUserTypeID in (24,23) then 1 else 0 end ,
         case when auditStatus = 0 then 1 else 0 end ,
@@ -708,7 +494,7 @@
 
 	<update id="updateEmployeePermission">
 		UPDATE user SET userPermission = #{userPermission}
-		WHERE companyUserID=#{companyUserID} AND userID != #{companyUserID} AND auditStatus = '1'
+		WHERE userID != #{companyUserID} AND auditStatus = '1'
 	</update>
 
 
@@ -724,7 +510,6 @@
 
 	<update id="initEmployeeInfo">
 		UPDATE user SET
-		    companyUserID = NULL,
 		    userIdentity = '0',
 		    userPermission = '1',
 		    registerUserTypeID = '10' ,
@@ -737,7 +522,7 @@
 			shopID = NULL ,
 			manufacturerStatus = NULL ,
 			tipStatus = '1'
-		WHERE companyUserID=#{companyUserID} AND userID != #{companyUserID}
+		WHERE userID != #{companyUserID}
 	</update>
 
 	<update id="updateAbleUserMoney">
@@ -763,9 +548,7 @@
 	<select id="getUserPayOrder" resultType="com.caimei.modules.order.entity.NewShopOrder">
         select *
         from cm_shop_order
-        where
-        (`status` = 2 || `status` = 3 || `status` = 4 || `status` = 5)
-        AND userID=#{userId}
+        where userID=#{userId}
     </select>
     <select id="selectByMobileOrEmail" resultType="com.caimei.modules.user.entity.CmUser">
 		select u.*,cu.mobile as operatorMobile from user u

src/main/resources/mappings/modules/user/CustomerMapper.xml

@@ -156,9 +156,7 @@
 	</update>
 
 	<update id="updateUserByUserId">
-		UPDATE user SET openID = NULL,
-		miniProgramOpenId = null
-		WHERE userID=#{userId}
+
 	</update>
 
 	<delete id="deleteWxUnitByUserId">

src/main/resources/mappings/modules/user/NewCmClubMapper.xml

@@ -23,6 +23,7 @@
 			a.linkManIdentity AS "linkManIdentity",
 			a.contractPhone AS "contractPhone",
 			a.contractMobile AS "contractMobile",
+			a.contractEmail AS "contractEmail",
 			a.fax AS "fax",
 			a.info AS "info",
 			a.addTime AS "addTime",
@@ -194,6 +195,7 @@
 			linkManIdentity,
 			contractPhone,
 			contractMobile,
+			contractEmail,
 			fax,
 			info,
 			addTime,
@@ -232,6 +234,7 @@
 			#{linkManIdentity},
 			#{contractPhone},
 			#{contractMobile},
+			#{contractEmail},
 			#{fax},
 		    #{info},
 			#{addTime},
@@ -310,6 +313,9 @@
 		<if test="contractMobile != null and contractMobile != ''">
 			contractMobile = #{contractMobile},
 			</if>
+		<if test="contractEmail != null and contractEmail != ''">
+			contractEmail = #{contractEmail},
+		</if>
 		<if test="fax != null and fax != ''">
 			fax = #{fax},
 			</if>

src/main/resources/mappings/modules/user/NewCmShopMapper.xml

@@ -23,6 +23,7 @@
 		a.linkMan AS "linkMan",
 		a.contractPhone AS "contractPhone",
 		u.bindMobile AS "contractMobile",
+		a.contractEmail AS "contractEmail",
 		a.fax AS "fax",
 		a.zipCode AS "zipCode",
 		a.info AS "info",
@@ -191,6 +192,7 @@
 			linkMan,
 			contractPhone,
 			contractMobile,
+			contractEmail,
 			fax,
 			zipCode,
 			info,
@@ -231,6 +233,7 @@
 			#{linkMan},
 			#{contractPhone},
 			#{contractMobile},
+		    #{contractEmail},
 			#{fax},
 			#{zipCode},
 			#{info},
@@ -303,6 +306,9 @@
 			<if test="contractMobile != null and contractMobile != ''" >
 				contractMobile = #{contractMobile},
 			</if>
+			<if test="contractEmail != null and contractEmail != ''" >
+				contractEmail = #{contractEmail},
+			</if>
 			<if test="fax != null and fax != ''" >
 				fax = #{fax},
 			</if>