Bladeren bron

user改表去除userPermission字段

zhijiezhao 1 jaar geleden
bovenliggende
commit
65f4adf737

+ 0 - 8
src/main/java/com/caimei365/user/mapper/ClubMapper.java

@@ -69,14 +69,6 @@ public interface ClubMapper {
      */
     void updateClubByUpdateInfo(ClubUpdateDto club);
 
-//    /**
-//     * 获取订单数量
-//     *
-//     * @param userId
-//     * @return
-//     */
-//    OrderCountVo getOrderCount(Integer userId);
-
     /**
      * 查询采美豆类型记录
      *

+ 0 - 8
src/main/java/com/caimei365/user/mapper/SuperVipMapper.java

@@ -71,14 +71,6 @@ public interface SuperVipMapper {
      */
     void addUserBeansHistory(Integer userId, Integer userBeans);
 
-    /**
-     * 用户权限修改
-     * 用户权限 0游客 1 普通用户 2 会员机构 3 供应商 4 协销 5 普通机构 6 呵呵商城用户【V6.2.0版本后0和1不存在】
-     *
-     * @param userId
-     * @param userPermission
-     */
-    void updateUserPermission(Integer userId, Integer userPermission);
 
     /**
      * 用户身份修改

+ 0 - 8
src/main/java/com/caimei365/user/model/po/UserPo.java

@@ -65,10 +65,6 @@ public class UserPo implements Serializable {
      * 用户身份: 1协销 2会员机构 3供应商 4普通机构
      */
     private Integer userIdentity;
-    /**
-     * 用户权限: 2会员机构 3供应商 4协销 5普通机构 6颜选用户
-     */
-    private Integer userPermission;
     /**
      * 是否已经引导过(机构升级:0否,1是)
      */
@@ -77,10 +73,6 @@ public class UserPo implements Serializable {
      * 组织名称
      */
     private String name;
-    /**
-     * 机构状态:90:已上线,91:已冻结,92:审查资料未通过,待补充资料,1:待审查资料,2:电话预约,3:已预约,20:待确认,21:待拜访,30:待员工推荐,40:已完成第一次采购
-     */
-    private Integer clubStatus;
     /**
      * 供应商状态:90:已上线,91:已下线,92:审核不通过,3:待审核
      */

+ 0 - 5
src/main/java/com/caimei365/user/model/vo/UserLoginVo.java

@@ -98,11 +98,6 @@ public class UserLoginVo implements Serializable {
      */
     @ApiModelProperty("用户身份: 1协销 2会员机构 3供应商 4普通机构")
     private Integer userIdentity;
-    /**
-     * 用户权限: 2会员机构 3供应商 4协销 5普通机构
-     */
-    @ApiModelProperty("用户权限: 2会员机构 3供应商 4协销 5普通机构")
-    private Integer userPermission;
     /**
      * 机构状态:90:已上线,91:已冻结,92:审查资料未通过,待补充资料,1:待审查资料,2:电话预约,3:已预约,20:待确认,21:待拜访,30:待员工推荐,40:已完成第一次采购
      */

+ 0 - 8
src/main/java/com/caimei365/user/model/vo/UserVo.java

@@ -61,18 +61,10 @@ public class UserVo implements Serializable {
      * 用户身份: 1协销 2会员机构 3供应商 4普通机构
      */
     private Integer userIdentity;
-    /**
-     * 用户权限: 2会员机构 3供应商 4协销 5普通机构
-     */
-    private Integer userPermission;
     /**
      * 组织名称
      */
     private String name;
-    /**
-     * 机构状态:90:已上线,91:已冻结,92:审查资料未通过,待补充资料,1:待审查资料,2:电话预约,3:已预约,20:待确认,21:待拜访,30:待员工推荐,40:已完成第一次采购
-     */
-    private Integer clubStatus;
     /**
      * 供应商状态:90:已上线,91:已下线,92:审核不通过,3:待审核
      */

+ 0 - 1
src/main/java/com/caimei365/user/service/impl/HeHeServiceImpl.java

@@ -88,7 +88,6 @@ public class HeHeServiceImpl implements HeHeService {
                     user.setName(heHeUserDto.getNickName());
                     user.setPassword("HeHe");
                     //6:呵呵商城用户
-                    user.setUserPermission(6);
                     user.setUserIdentity(6);
                     user.setRegisterUserTypeId(6);
                     user.setRegisterTime(currentTime);

+ 0 - 5
src/main/java/com/caimei365/user/service/impl/LoginServiceImpl.java

@@ -829,11 +829,6 @@ public class LoginServiceImpl implements LoginService {
         // 超级会员
         SuperVipDto end = findEnd(loginUser.getUserId());
         loginUser.setVipFlag(end.getVipFlag());
-//        if (1 == end.getVipFlag() && 4 == loginUser.getUserIdentity()) {
-//            // 个人超级会员权限置为会员机构
-//            loginUser.setUserIdentity(2);
-//            loginUser.setUserPermission(2);
-//        }
 
         if (loginUser.getUserId() != null) {
             Integer shopID = messageCenterMapper.shopID(loginUser.getUserId());

+ 0 - 25
src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -199,12 +199,8 @@ public class RegisterServiceImpl implements RegisterService {
         user.setBindMobile(clubRegisterDto.getBindMobile());
         // 用户身份: 1协销 2会员机构 3供应商 4普通机构
         user.setUserIdentity(4);
-        // 用户权限: 2会员机构 3供应商 4协销 5普通机构
-        user.setUserPermission(5);
         // 是否已经引导过(机构升级:0否,1是)
         user.setGuideFlag(0);
-        // 设置机构上线
-        user.setClubStatus(90);
         // 设置密码
         user.setPassword(Md5Util.md5(clubRegisterDto.getPassword()));
         // 同意协议
@@ -341,9 +337,6 @@ public class RegisterServiceImpl implements RegisterService {
             log.info("注册普通机构,默认绑定为机构运营人员");
         }
         log.info("注册普通机构成功,手机号>>>" + clubRegisterDto.getBindMobile());
-//        if (!smsFlag) {
-//            log.info("短信发送失败,手机号:" + clubRegisterDto.getBindMobile());
-//        }
         //新用户自主注册送1000采美豆
         UserBeansHistoryPo beansHistory = new UserBeansHistoryPo();
         beansHistory.setUserId(user.getUserId());
@@ -456,12 +449,8 @@ public class RegisterServiceImpl implements RegisterService {
         user.setBindMobile(organizeRegisterDto.getBindMobile());
         // 用户身份: 1协销 2会员机构 3供应商 4普通机构
         user.setUserIdentity(4);
-        // 用户权限: 2会员机构 3供应商 4协销 5普通机构
-        user.setUserPermission(5);
         // 是否已经引导过(机构升级:0否,1是)
         user.setGuideFlag(0);
-        // 联合丽格设置待审核
-        user.setClubStatus(1);
         // 设置密码
         user.setPassword(Md5Util.md5(organizeRegisterDto.getPassword()));
         // 同意协议
@@ -670,8 +659,6 @@ public class RegisterServiceImpl implements RegisterService {
         user.setEmail(upgradeDto.getContractEmail());
         // 机构名称
         user.setName(upgradeDto.getName());
-        // 待审核资料
-        user.setClubStatus(1);
         // 更新机构用户
         registerMapper.updateClubUserByUpgrade(user);
         /*
@@ -844,10 +831,6 @@ public class RegisterServiceImpl implements RegisterService {
         user.setBindMobile(mobile);
         // 用户身份: 1协销 2会员机构 3供应商 4普通机构
         user.setUserIdentity(4);
-        // 用户权限: 2会员机构 3供应商 4协销 5普通机构
-        user.setUserPermission(5);
-        // 设置机构上线
-        user.setClubStatus(90);
         // 默认密码
         String randomCode = CodeUtil.generateCodeInt(6);
         String initPassword = "cm" + randomCode;
@@ -862,8 +845,6 @@ public class RegisterServiceImpl implements RegisterService {
         user.setServiceProviderStatus(serviceProvider.getStatus());
         // 会员机构,填写升级资料
         if (StringUtils.isNotBlank(businessLicense)) {
-            // 状态:待审查资料
-            user.setClubStatus(1);
             // 组织名称
             user.setName(clubTemporary.getName());
             // 邮箱
@@ -883,7 +864,6 @@ public class RegisterServiceImpl implements RegisterService {
             }
         } else {
             user.setUserId(confirmUserId);
-            user.setClubStatus(90);
             registerMapper.updateClubUser(user);
             log.info("客服注册机构注册,更新user表userId>>>>>" + confirmUserId);
         }
@@ -999,9 +979,6 @@ public class RegisterServiceImpl implements RegisterService {
         messageCenter.setTime(current);
         messageCenterMapper.addMessageCenter(messageCenter);
 
-
-
-
         /*
          * 操作成功,推送短信给机构,获取账号密码。
          * 协销去后台审核,机构用账号密码登录绑定微信
@@ -1149,8 +1126,6 @@ public class RegisterServiceImpl implements RegisterService {
         user.setEmail(shopRegisterDto.getEmail());
         // 用户身份: 1协销 2会员机构 3供应商 4普通机构
         user.setUserIdentity(3);
-        // 用户权限: 2会员机构 3供应商 4协销 5普通机构
-        user.setUserPermission(3);
         // 供应商状态:90:已上线,91:已下线,92:审核不通过,3:待审核
         user.setManufacturerStatus(3);
         // 用户状态,1正常,0冻结

+ 4 - 5
src/main/resources/mapper/BaseMapper.xml

@@ -86,7 +86,7 @@
         SELECT serviceProviderID as serviceProviderId, status as operationStatus FROM serviceprovider WHERE contractMobile = #{mobile} and organizeId = 4 limit 1
     </select>
     <select id="getUserIdByOrganizeStatus" resultType="com.caimei365.user.model.vo.UserLoginVo">
-        SELECT userId, userIdentity, clubStatus
+        SELECT userId, userIdentity, (select status from club where userId = USER.userId limit 1) as clubStatus
         FROM USER
         WHERE userOrganizeID = #{organizeId}
           AND bindMobile = #{mobile}
@@ -101,8 +101,8 @@
         limit 1
     </select>
     <select id="getClubStatusByUserId" resultType="java.lang.Integer">
-        select clubStatus
-        from user
+        select status
+        from club
         where userID = #{userId}
     </select>
     <select id="getShopStatusByUserId" resultType="java.lang.Integer">
@@ -146,8 +146,7 @@
                bindMobile,
                password,
                userIdentity,
-               userPermission,
-               clubStatus,
+               (select status from club where userId = user.userId limit 1) as clubStatus,
                manufacturerStatus,
                serviceProviderStatus,
                auditNote,

+ 1 - 2
src/main/resources/mapper/ClubMapper.xml

@@ -87,8 +87,7 @@
         <if test="email != null and email != ''">
             email = #{email},
         </if>
-        userName = #{userName},
-        clubStatus = 1
+        userName = #{userName}
         where userID = #{userId}
     </update>
     <select id="selClubData" resultType="com.caimei365.user.model.vo.ClubVo">

+ 49 - 52
src/main/resources/mapper/HeHeMapper.xml

@@ -5,83 +5,80 @@
 <mapper namespace="com.caimei365.user.mapper.HeHeMapper">
 
     <select id="findHeHeUserByOpenId" resultType="com.caimei365.user.model.vo.HeHeUserVo">
-        SELECT
-          userId,
-          NAME,
-          mobile,
-          userIdentity,
-          nickName,
-          headImgUrl,
-          openId
-        FROM
-          cm_hehe_user
-        WHERE
-          openId = #{openId}
+        SELECT userId,
+               NAME,
+               mobile,
+               userIdentity,
+               nickName,
+               headImgUrl,
+               openId
+        FROM cm_hehe_user
+        WHERE openId = #{openId}
     </select>
 
     <select id="findHeHeUserByMobile" resultType="com.caimei365.user.model.vo.HeHeUserVo">
-        SELECT
-          userId,
-          NAME,
-          mobile,
-          userIdentity,
-          nickName,
-          headImgUrl,
-          openId
-        FROM
-          cm_hehe_user
-        WHERE
-          mobile = #{mobile}
+        SELECT userId,
+               NAME,
+               mobile,
+               userIdentity,
+               nickName,
+               headImgUrl,
+               openId
+        FROM cm_hehe_user
+        WHERE mobile = #{mobile}
     </select>
     <select id="getCurrentCouponIds" resultType="java.lang.Integer">
         select id
         from cm_hehe_coupon
-        where couponType = #{couponType} and if(startNowFlag = 1,true, NOW() <![CDATA[  >=  ]]> startTime )
-          and if(permanentFlag = 1,true,NOW() <![CDATA[  <=  ]]> endTime) and delFlag = 0
+        where couponType = #{couponType}
+          and if(startNowFlag = 1, true, NOW() <![CDATA[  >=  ]]> startTime)
+          and if(permanentFlag = 1, true, NOW() <![CDATA[  <=  ]]> endTime)
+          and delFlag = 0
     </select>
     <select id="getCouponAmount" resultType="java.lang.Double">
-        select couponAmount from cm_hehe_coupon where id = #{couponId}
+        select couponAmount
+        from cm_hehe_coupon
+        where id = #{couponId}
     </select>
     <select id="findUserMobile" resultType="java.lang.String">
-        select mobile from cm_hehe_user where userId = #{shareUserId}
+        select mobile
+        from cm_hehe_user
+        where userId = #{shareUserId}
     </select>
     <select id="getGroupQrCode" resultType="java.lang.String">
-        select image from cm_hehe_related_images where id = 1;
+        select image
+        from cm_hehe_related_images
+        where id = 1;
     </select>
 
     <update id="updateHeHeUser">
         UPDATE
-          `cm_hehe_user`
-        SET
-          `nickName` = #{nickName},
-          `headImgUrl` = #{headImgUrl},
-          `openId` = #{openId}
-        WHERE
-          `userId` = #{userId}
+            `cm_hehe_user`
+        SET `nickName`   = #{nickName},
+            `headImgUrl` = #{headImgUrl},
+            `openId`     = #{openId}
+        WHERE `userId` = #{userId}
     </update>
 
     <insert id="insertHeHeUser">
         insert into cm_hehe_user (userId, `name`, mobile,
-          userIdentity, nickName, headImgUrl,
-          openId, addTime)
+                                  userIdentity, nickName, headImgUrl,
+                                  openId, addTime)
         values (#{userId}, #{name}, #{mobile},
-          #{userIdentity}, #{nickName}, #{headImgUrl},
-          #{openId}, #{addTime})
+                #{userIdentity}, #{nickName}, #{headImgUrl},
+                #{openId}, #{addTime})
     </insert>
 
-    <insert id="insertUser" parameterType="com.caimei365.user.model.po.UserPo" keyColumn="userID" keyProperty="userId" useGeneratedKeys="true">
-        INSERT INTO USER (
-		  bindMobile, userPermission, userIdentity,
-		  userName, password, name, registerTime,
-		  validFlag, registerUserTypeID
-		)
-		VALUES
-		  (
-			#{bindMobile}, #{userPermission}, #{userIdentity},
-			#{userName}, #{password}, #{name}, #{registerTime},
-			#{validFlag}, #{registerUserTypeId}
-		  )
+    <insert id="insertUser" parameterType="com.caimei365.user.model.po.UserPo" keyColumn="userID" keyProperty="userId"
+            useGeneratedKeys="true">
+        INSERT INTO USER (bindMobile, userIdentity,
+                          userName, password, name, registerTime,
+                          validFlag, registerUserTypeID)
+        VALUES (#{bindMobile}, #{userIdentity},
+                #{userName}, #{password}, #{name}, #{registerTime},
+                #{validFlag}, #{registerUserTypeId})
     </insert>
+
     <insert id="insertCouponShare">
         insert into cm_hehe_coupon_share (shareUserId, receiveUserId, shareCouponId, type, createTime)
         values (#{shareUserId}, #{receiveUserId}, #{shareCouponId}, 1, NOW())

+ 14 - 26
src/main/resources/mapper/LoginMapper.xml

@@ -11,11 +11,10 @@
                u.mobile             as mobile,
                u.bindMobile         as bindMobile,
                u.email              as email,
-               u.userPermission     as userPermission,
                u.userIdentity       as userIdentity,
                u.password           as password,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1)          as clubStatus,
                u.manufacturerStatus as shopStatus
         from user u
         where u.userID = #{userId}
@@ -32,11 +31,10 @@
                u.mobile             as mobile,
                u.bindMobile         as bindMobile,
                u.email              as email,
-               u.userPermission     as userPermission,
                u.userIdentity       as userIdentity,
                u.password           as password,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1)  as clubStatus,
                u.manufacturerStatus as shopStatus,
                cu.id                as operationId,
                cu.status            as operationStatus,
@@ -58,11 +56,10 @@
                u.mobile             AS mobile,
                u.bindMobile         AS bindMobile,
                u.email              AS email,
-               u.userPermission     AS userPermission,
                u.userIdentity       AS userIdentity,
                u.password           AS PASSWORD,
                u.guideFlag          AS guideFlag,
-               u.clubStatus         AS clubStatus,
+               (select status from club where userId = u.userId limit 1) AS clubStatus,
                u.manufacturerStatus AS shopStatus,
                cu.id                AS operationId,
                cu.status            AS operationStatus,
@@ -85,15 +82,14 @@
                u.serviceProviderId  as serviceProviderId,
                u.userName           as userName,
                u.name               as name,
-               ( SELECT linkMan FROM club WHERE userId = u.userID) as clubLinkMan,
+               (SELECT linkMan FROM club WHERE userId = u.userID) as clubLinkMan,
                u.mobile             as mobile,
                u.bindMobile         as bindMobile,
                u.email              as email,
-               u.userPermission     as userPermission,
                u.userIdentity       as userIdentity,
                u.password           as password,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1) as clubStatus,
                u.manufacturerStatus as shopStatus,
                u.serviceProviderStatus as serviceStatus,
                cu.id                as operationId,
@@ -116,11 +112,10 @@
                u.mobile             AS mobile,
                u.bindMobile         AS bindMobile,
                u.email              AS email,
-               u.userPermission     AS userPermission,
                u.userIdentity       AS userIdentity,
                u.password           AS PASSWORD,
                u.guideFlag          AS guideFlag,
-               u.clubStatus         AS clubStatus,
+               (select status from club where userId = u.userId limit 1) AS clubStatus,
                u.manufacturerStatus AS shopStatus,
                u.serviceProviderStatus as serviceStatus,
                cu.id                AS operationId,
@@ -152,14 +147,12 @@
                u.mobile             as mobile,
                u.bindMobile         as bindMobile,
                u.email              as email,
-               u.userPermission     as userPermission,
                u.userIdentity       as userIdentity,
                u.password           as password,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
                u.manufacturerStatus as shopStatus,
                cu.id                as operationId,
-               cu.status            as operationStatus,
+               (select status from club where userId = u.userId limit 1) as clubStatus,
                cu.mobile            as operationMobile
         from user u
                  left join cm_mall_operation_user cu on cu.userID = u.userID
@@ -176,7 +169,6 @@
                u.mobile            as mobile,
                u.bindMobile        as bindMobile,
                u.email             as email,
-               u.userPermission    as userPermission,
                u.userIdentity      as userIdentity,
                u.guideFlag         as guideFlag,
                u.password          as password
@@ -204,11 +196,10 @@
         u.mobile as mobile,
         u.bindMobile as bindMobile,
         u.email as email,
-        u.userPermission as userPermission,
         u.userIdentity as userIdentity,
         u.password as password,
         u.guideFlag as guideFlag,
-        u.clubStatus as clubStatus,
+        (select status from club where userId = u.userId limit 1) as clubStatus,
         u.manufacturerStatus as shopStatus,
         o.unionId as unionId,
         o.status as operationStatus,
@@ -234,12 +225,11 @@
         u.mobile as mobile,
         u.bindMobile as bindMobile,
         u.email as email,
-        u.userPermission as userPermission,
         u.userIdentity as userIdentity,
         u.serviceProviderID as serviceProviderId,
         u.password as password,
         u.guideFlag as guideFlag,
-        u.clubStatus as clubStatus,
+        c.status as clubStatus,
         u.manufacturerStatus as shopStatus,
         u.serviceProviderStatus as serviceStatus,
         o.unionId as unionId,
@@ -268,11 +258,10 @@
         u.mobile as mobile,
         u.bindMobile as bindMobile,
         u.email as email,
-        u.userPermission as userPermission,
         u.userIdentity as userIdentity,
         u.password as password,
         u.guideFlag as guideFlag,
-        u.clubStatus as clubStatus,
+        (select status from club where userId = u.userId limit 1) as clubStatus,
         u.manufacturerStatus as shopStatus,
         o.unionId as unionId,
         o.status as operationStatus,
@@ -308,12 +297,11 @@
         u.mobile as mobile,
         u.bindMobile as bindMobile,
         u.email as email,
-        u.userPermission as userPermission,
         u.userIdentity as userIdentity,
         u.serviceProviderID as serviceProviderId,
         u.password as password,
         u.guideFlag as guideFlag,
-        u.clubStatus as clubStatus,
+        c.status as clubStatus,
         u.manufacturerStatus as shopStatus,
         o.unionId as unionId,
         o.status as operationStatus,
@@ -377,7 +365,7 @@
                ifnull(cou.userOrganizeID, 0) as organizeId,
                u.userIdentity,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1) as clubStatus,
                u.manufacturerStatus as shopStatus,
                cou.invitationCodeTime,
                cou.mobile           as operationMobile,
@@ -399,7 +387,7 @@
                ifnull(cou.userOrganizeID, 0) as organizeId,
                u.userIdentity,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1) as clubStatus,
                u.manufacturerStatus as shopStatus,
                cou.invitationCodeTime,
                cou.mobile           as operationMobile,
@@ -420,7 +408,7 @@
                u.name               as name,
                u.userIdentity,
                u.guideFlag          as guideFlag,
-               u.clubStatus         as clubStatus,
+               (select status from club where userId = u.userId limit 1) as clubStatus,
                u.manufacturerStatus as shopStatus,
                cou.invitationCodeTime,
                cou.mobile           as operationMobile,

+ 226 - 193
src/main/resources/mapper/RegisterMapper.xml

@@ -1,251 +1,284 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei365.user.mapper.RegisterMapper">
-    <insert id="insertClubUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId" useGeneratedKeys="true">
-        insert into user(`userOrganizeID`,`registerTime`,`registerIP`, `ipAddress`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`,`guideFlag`,`clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`, userBeans)
-                  values(#{organizeId},#{registerTime},#{registerIp},#{ipAddress},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{guideFlag},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus}, #{userBeans})
+    <insert id="insertClubUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId"
+            useGeneratedKeys="true">
+        insert into user(`userOrganizeID`, `registerTime`, `registerIP`, `ipAddress`, `source`, `registerUserTypeID`,
+                         `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `guideFlag`,
+                         `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`, userBeans)
+        values (#{organizeId}, #{registerTime}, #{registerIp}, #{ipAddress}, #{source}, #{registerUserTypeId}, #{name},
+                #{userName}, #{bindMobile}, #{email}, #{userIdentity}, #{guideFlag}, #{password},
+                #{agreeFlag}, #{validFlag}, #{serviceProviderId}, #{serviceProviderStatus}, #{userBeans})
     </insert>
     <select id="selUser" resultType="com.caimei365.user.model.po.UserPo">
-        select * from user where registerTime = #{registerTime}
+        select *
+        from user
+        where registerTime = #{registerTime}
     </select>
     <insert id="insertOrgan">
         insert into cm_organ_value_system
             (userID, activeState, customerValue, stage, delType)
-            values(#{userID},"新增用户","一般挽留客户",0,1)
+        values (#{userID}, "新增用户", "一般挽留客户", 0, 1)
     </insert>
-    <insert id="insertClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`, `scanFlag`, provinceID, cityID, townID, address, headpic, businessLicenseImage, medicalPracticeLicenseImg, socialCreditCode)
-                  values(#{name},#{shortName},#{contractMobile},#{linkMan},#{userId},#{addTime},#{status}, #{serviceProviderId}, #{scanFlag}, #{provinceId}, #{cityId}, #{townId}, #{address}, #{shopPhoto}, #{businessLicense},#{medicalPracticeLicense}, #{socialCreditCode})
+    <insert id="insertClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId"
+            useGeneratedKeys="true">
+        insert into club(`name`, `sname`, `contractMobile`, `linkMan`, `userID`, `addTime`, `status`, `spID`,
+                         `scanFlag`, provinceID, cityID, townID, address, headpic, businessLicenseImage,
+                         medicalPracticeLicenseImg, socialCreditCode)
+        values (#{name}, #{shortName}, #{contractMobile}, #{linkMan}, #{userId}, #{addTime}, #{status},
+                #{serviceProviderId}, #{scanFlag}, #{provinceId}, #{cityId}, #{townId}, #{address}, #{shopPhoto},
+                #{businessLicense}, #{medicalPracticeLicense}, #{socialCreditCode})
     </insert>
-    <insert id="insertUpgradeClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId" useGeneratedKeys="true">
-        insert into club(`name`, `sname`,     `contractMobile`, `userID`, `addTime`, `status`, `spID`,              `scanFlag`,`contractEmail`,`linkMan`, `provinceID`, `cityID`,`townID`, `address`, `headpic`, `businessLicenseImage`,`socialCreditCode`,`firstClubType`,`secondClubType`,`department`,`medicalPracticeLicenseImg`,`mainpro`)
-                  values(#{name},#{shortName},#{contractMobile},#{userId},#{addTime},#{status},#{serviceProviderId},#{scanFlag},#{contractEmail},#{linkMan},#{provinceId},#{cityId},#{townId},#{address},#{shopPhoto},#{businessLicense},#{socialCreditCode},#{firstClubType},#{secondClubType},#{department},#{medicalPracticeLicense},#{mainProduct})
+    <insert id="insertUpgradeClub" parameterType="com.caimei365.user.model.po.ClubPo" keyProperty="clubId"
+            useGeneratedKeys="true">
+        insert into club(`name`, `sname`, `contractMobile`, `userID`, `addTime`, `status`, `spID`, `scanFlag`,
+                         `contractEmail`, `linkMan`, `provinceID`, `cityID`, `townID`, `address`, `headpic`,
+                         `businessLicenseImage`, `socialCreditCode`, `firstClubType`, `secondClubType`, `department`,
+                         `medicalPracticeLicenseImg`, `mainpro`)
+        values (#{name}, #{shortName}, #{contractMobile}, #{userId}, #{addTime}, #{status}, #{serviceProviderId},
+                #{scanFlag}, #{contractEmail}, #{linkMan}, #{provinceId}, #{cityId}, #{townId}, #{address},
+                #{shopPhoto}, #{businessLicense}, #{socialCreditCode}, #{firstClubType}, #{secondClubType},
+                #{department}, #{medicalPracticeLicense}, #{mainProduct})
     </insert>
-    <insert id="insertOperation" parameterType="com.caimei365.user.model.po.OperationPo" keyProperty="id" useGeneratedKeys="true">
-        insert into cm_mall_operation_user(`userID`, `clubID`, `shopID`, `userOrganizeID`,`linkName`,`nickName`,`headimgurl`,`userType`,`mobile`,`status`, `unionId`, `openid`,`pcOpenid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)
-                                    values(#{userId},#{clubId},#{shopId},#{organizeId},#{linkName},#{nickName},#{avatarUrl},#{userType},#{mobile} ,#{status},#{unionId},#{openId},#{pcOpenId},#{addTime},#{updateTime},#{bindTime},#{delFlag})
+    <insert id="insertOperation" parameterType="com.caimei365.user.model.po.OperationPo" keyProperty="id"
+            useGeneratedKeys="true">
+        insert into cm_mall_operation_user(`userID`, `clubID`, `shopID`, `userOrganizeID`, `linkName`, `nickName`,
+                                           `headimgurl`, `userType`, `mobile`, `status`, `unionId`, `openid`,
+                                           `pcOpenid`, `addTime`, `updateTime`, `bindTime`, `delFlag`)
+        values (#{userId}, #{clubId}, #{shopId}, #{organizeId}, #{linkName}, #{nickName}, #{avatarUrl}, #{userType},
+                #{mobile}, #{status}, #{unionId}, #{openId}, #{pcOpenId}, #{addTime}, #{updateTime}, #{bindTime},
+                #{delFlag})
     </insert>
-    <insert id="insertShopUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId" useGeneratedKeys="true">
-        insert into user(`userOrganizeID`,`registerTime`, `registerIP`, `ipAddress`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`, `manufacturerStatus` , `password`, `agreeFlag`, `validFlag`)
-        values(#{organizeId},#{registerTime},#{registerIp},#{ipAddress},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{manufacturerStatus},#{password},#{agreeFlag},#{validFlag})
+    <insert id="insertShopUser" parameterType="com.caimei365.user.model.po.UserPo" keyProperty="userId"
+            useGeneratedKeys="true">
+        insert into user(`userOrganizeID`, `registerTime`, `registerIP`, `ipAddress`, `source`, `registerUserTypeID`,
+                         `name`, `userName`, `bindMobile`, `email`, `userIdentity`,
+                         `manufacturerStatus`, `password`, `agreeFlag`, `validFlag`)
+        values (#{organizeId}, #{registerTime}, #{registerIp}, #{ipAddress}, #{source}, #{registerUserTypeId}, #{name},
+                #{userName}, #{bindMobile}, #{email}, #{userIdentity}, #{manufacturerStatus},
+                #{password}, #{agreeFlag}, #{validFlag})
     </insert>
-    <insert id="insertShop" parameterType="com.caimei365.user.model.po.ShopPo" keyProperty="shopId" useGeneratedKeys="true">
-        insert into shop(`userID`, `name`, `sname`, `linkMan`, `contractMobile`, `contractEmail`, `provinceID`, `cityID`, `townID`, `address`, `socialCreditCode`, `businessLicenseImage`, `firstShopType`, `secondShopType`, `mainpro`, `productDesc`, `info`, `website`, `wxOfficialAccount`, `wxApplets`, `addTime`, `validFlag`, `status`,medicalPracticeLicenseImg1)
-        values(#{userId},#{name},#{shortName},#{linkMan},#{contractMobile},#{contractEmail},#{provinceId},#{cityId},#{townId},#{address},#{socialCreditCode},#{businessLicense},#{firstShopType},#{secondShopType},#{mainProduct},#{mainProductDesc},#{shopDesc},#{website},#{wxOfficialAccount},#{wxApplets},#{addTime},#{validFlag},#{status},#{medicalPracticeLicenseImg1})
+    <insert id="insertShop" parameterType="com.caimei365.user.model.po.ShopPo" keyProperty="shopId"
+            useGeneratedKeys="true">
+        insert into shop(`userID`, `name`, `sname`, `linkMan`, `contractMobile`, `contractEmail`, `provinceID`,
+                         `cityID`, `townID`, `address`, `socialCreditCode`, `businessLicenseImage`, `firstShopType`,
+                         `secondShopType`, `mainpro`, `productDesc`, `info`, `website`, `wxOfficialAccount`,
+                         `wxApplets`, `addTime`, `validFlag`, `status`, medicalPracticeLicenseImg1)
+        values (#{userId}, #{name}, #{shortName}, #{linkMan}, #{contractMobile}, #{contractEmail}, #{provinceId},
+                #{cityId}, #{townId}, #{address}, #{socialCreditCode}, #{businessLicense}, #{firstShopType},
+                #{secondShopType}, #{mainProduct}, #{mainProductDesc}, #{shopDesc}, #{website}, #{wxOfficialAccount},
+                #{wxApplets}, #{addTime}, #{validFlag}, #{status}, #{medicalPracticeLicenseImg1})
     </insert>
     <update id="updateUserClubId">
-        update user set clubID = #{clubId} where userID = #{userId}
+        update user
+        set clubID = #{clubId}
+        where userID = #{userId}
     </update>
     <update id="updateUserShopId">
-        update user set shopID = #{shopId} where userID = #{userId}
+        update user
+        set shopID = #{shopId}
+        where userID = #{userId}
     </update>
     <update id="updateClubUserByUpgrade">
-        update user set registerIP = #{registerIp},
-                        email = #{email},
-                        name = #{name},
-                        clubStatus = #{clubStatus}
+        update user
+        set registerIP = #{registerIp},
+            email      = #{email},
+            name       = #{name}
         where userID = #{userId}
     </update>
     <update id="updateShopUserByApply">
         update user set userName = #{userName}, name = #{name}, manufacturerStatus = #{manufacturerStatus}
-            <if test="email != null and email != ''">
-                , email = #{email}
-            </if>
+        <if test="email != null and email != ''">
+            , email = #{email}
+        </if>
         where userID = #{userId}
     </update>
     <update id="updateClubByUpgrade">
         update club set userID = #{userId}, name = #{name}, sname = #{shortName}, contractEmail = #{contractEmail},
-            <if test="contractPhone != null and contractPhone != ''">
-                contractPhone = #{contractPhone},
-            </if>
-            <if test="linkMan != null and linkMan != ''">
-                linkMan = #{linkMan},
-            </if>
-            <if test="linkManIdentity != null and linkManIdentity != ''">
-                linkManIdentity = #{linkManIdentity},
-            </if>
-            provinceID = #{provinceId}, cityID = #{cityId}, townID = #{townId}, address = #{address},
-            <if test="shopPhoto != null  and shopPhoto != 'null'  and shopPhoto != ''">
-                headpic = #{shopPhoto},
-            </if>
-            businessLicenseImage = #{businessLicense}, socialCreditCode = #{socialCreditCode}, firstClubType = #{firstClubType},
-            <if test="firstClubType == 1">
-                secondClubType = #{secondClubType}, department = #{department}, medicalPracticeLicenseImg = #{medicalPracticeLicense},
-            </if>
-            <if test="mainProduct != null and mainProduct != ''">
-                mainpro = #{mainProduct},
-            </if>
-            <if test="fax != null and fax != ''">
-                fax = #{fax},
-            </if>
-            <if test="profile != null and profile != ''">
-                info = #{profile},
-            </if>
-            status = #{status}
+        <if test="contractPhone != null and contractPhone != ''">
+            contractPhone = #{contractPhone},
+        </if>
+        <if test="linkMan != null and linkMan != ''">
+            linkMan = #{linkMan},
+        </if>
+        <if test="linkManIdentity != null and linkManIdentity != ''">
+            linkManIdentity = #{linkManIdentity},
+        </if>
+        provinceID = #{provinceId}, cityID = #{cityId}, townID = #{townId}, address = #{address},
+        <if test="shopPhoto != null  and shopPhoto != 'null'  and shopPhoto != ''">
+            headpic = #{shopPhoto},
+        </if>
+        businessLicenseImage = #{businessLicense}, socialCreditCode = #{socialCreditCode}, firstClubType =
+        #{firstClubType},
+        <if test="firstClubType == 1">
+            secondClubType = #{secondClubType}, department = #{department}, medicalPracticeLicenseImg =
+            #{medicalPracticeLicense},
+        </if>
+        <if test="mainProduct != null and mainProduct != ''">
+            mainpro = #{mainProduct},
+        </if>
+        <if test="fax != null and fax != ''">
+            fax = #{fax},
+        </if>
+        <if test="profile != null and profile != ''">
+            info = #{profile},
+        </if>
+        status = #{status}
         where clubID = #{clubId}
     </update>
     <update id="updateShopInfoByApply">
         update shop set userID = #{userId}, name = #{name},
-            <if test="shortName != null and shortName != ''">
-                sname = #{shortName},
-            </if>
-            <if test="email != null and email != ''">
-                contractEmail = #{email},
-            </if>
-            <if test="linkMan != null and linkMan != ''">
-                linkMan = #{linkMan},
-            </if>
-            <if test="townId != null and townId != ''">
-                provinceID = #{provinceId},cityID = #{cityId},townID = #{townId},address = #{address},
-            </if>
-            <if test="socialCreditCode != null and socialCreditCode != ''">
-                socialCreditCode = #{socialCreditCode},
-            </if>
-            <if test="businessLicense != null and businessLicense != ''">
-                businessLicenseImage = #{businessLicense},
-            </if>
-            <if test="firstShopType != null and firstShopType != ''">
-                firstShopType = #{firstShopType},
-            </if>
-            <if test="secondShopType != null and secondShopType != ''">
-                secondShopType = #{secondShopType},
-            </if>
-            <if test="mainProduct != null and mainProduct != ''">
-                mainpro = #{mainProduct},
-            </if>
-            productDesc = #{mainProductDesc},
-            info = #{shopDesc},
-            website = #{website},
-            wxOfficialAccount = #{wxOfficialAccount},
-            wxApplets = #{wxApplets},
-            status = #{status}
+        <if test="shortName != null and shortName != ''">
+            sname = #{shortName},
+        </if>
+        <if test="email != null and email != ''">
+            contractEmail = #{email},
+        </if>
+        <if test="linkMan != null and linkMan != ''">
+            linkMan = #{linkMan},
+        </if>
+        <if test="townId != null and townId != ''">
+            provinceID = #{provinceId},cityID = #{cityId},townID = #{townId},address = #{address},
+        </if>
+        <if test="socialCreditCode != null and socialCreditCode != ''">
+            socialCreditCode = #{socialCreditCode},
+        </if>
+        <if test="businessLicense != null and businessLicense != ''">
+            businessLicenseImage = #{businessLicense},
+        </if>
+        <if test="firstShopType != null and firstShopType != ''">
+            firstShopType = #{firstShopType},
+        </if>
+        <if test="secondShopType != null and secondShopType != ''">
+            secondShopType = #{secondShopType},
+        </if>
+        <if test="mainProduct != null and mainProduct != ''">
+            mainpro = #{mainProduct},
+        </if>
+        productDesc = #{mainProductDesc},
+        info = #{shopDesc},
+        website = #{website},
+        wxOfficialAccount = #{wxOfficialAccount},
+        wxApplets = #{wxApplets},
+        status = #{status}
         where shopID = #{shopId}
     </update>
 
     <update id="updateGuideFlagByUserId">
-        update user set guideFlag=1 where userID=#{userId}
+        update user
+        set guideFlag=1
+        where userID = #{userId}
     </update>
 
-    <insert id="insertClubTemporary" useGeneratedKeys="true" keyProperty="userId" keyColumn="id" parameterType="com.caimei365.user.model.dto.ClubOnlineDto">
-        INSERT INTO `club_temporary` (
-          `userId`, `name`, `shortName`, `bindMobile`,
-          `contractEmail`, `linkMan`, `linkManIdentity`, `provinceId`,
-          `cityId`, `townId`, `address`, `shopPhoto`,
-          `businessLicense`, `socialCreditCode`,
-          `firstClubType`, `secondClubType`,
-          `department`, `medicalPracticeLicense`,
-          `mainProduct`, `isAgreed`,addTime
-        )
-        VALUES
-          (
-            #{userId}, #{name}, #{shortName}, #{bindMobile},
-            #{contractEmail}, #{linkMan}, #{linkManIdentity}, #{provinceId},
-            #{cityId}, #{townId}, #{address}, #{shopPhoto},
-            #{businessLicense}, #{socialCreditCode},
-            #{firstClubType}, #{secondClubType},
-            #{department}, #{medicalPracticeLicense},
-            #{mainProduct}, #{isAgreed},now()
-          )
+    <insert id="insertClubTemporary" useGeneratedKeys="true" keyProperty="userId" keyColumn="id"
+            parameterType="com.caimei365.user.model.dto.ClubOnlineDto">
+        INSERT INTO `club_temporary` (`userId`, `name`, `shortName`, `bindMobile`,
+                                      `contractEmail`, `linkMan`, `linkManIdentity`, `provinceId`,
+                                      `cityId`, `townId`, `address`, `shopPhoto`,
+                                      `businessLicense`, `socialCreditCode`,
+                                      `firstClubType`, `secondClubType`,
+                                      `department`, `medicalPracticeLicense`,
+                                      `mainProduct`, `isAgreed`, addTime)
+        VALUES (#{userId}, #{name}, #{shortName}, #{bindMobile},
+                #{contractEmail}, #{linkMan}, #{linkManIdentity}, #{provinceId},
+                #{cityId}, #{townId}, #{address}, #{shopPhoto},
+                #{businessLicense}, #{socialCreditCode},
+                #{firstClubType}, #{secondClubType},
+                #{department}, #{medicalPracticeLicense},
+                #{mainProduct}, #{isAgreed}, now())
     </insert>
 
     <select id="getTemporary" resultType="com.caimei365.user.model.vo.ClubTemporaryVo">
-        SELECT
-          `userId`,
-          confirmUserId,
-          `name`,
-          `shortName`,
-          `bindMobile`,
-          `contractEmail`,
-          `linkMan`,
-          `provinceId`,
-          `cityId`,
-          `townId`,
-          `address`,
-          `shopPhoto`,
-          `businessLicense`,
-          `socialCreditCode`,
-          `firstClubType`,
-          `secondClubType`,
-          `department`,
-          `medicalPracticeLicense`,
-          `mainProduct`,
-          `isAgreed`
-        FROM
-          `club_temporary`
-        WHERE
-          id = #{id}
+        SELECT `userId`,
+               confirmUserId,
+               `name`,
+               `shortName`,
+               `bindMobile`,
+               `contractEmail`,
+               `linkMan`,
+               `provinceId`,
+               `cityId`,
+               `townId`,
+               `address`,
+               `shopPhoto`,
+               `businessLicense`,
+               `socialCreditCode`,
+               `firstClubType`,
+               `secondClubType`,
+               `department`,
+               `medicalPracticeLicense`,
+               `mainProduct`,
+               `isAgreed`
+        FROM `club_temporary`
+        WHERE id = #{id}
     </select>
 
     <insert id="insertBeansHistory">
-        INSERT INTO `user_beans_history` (
-          `userId`, `type`, `beansType`, `orderId`, `archiveId`,
-          `num`, `pushStatus`, `addTime`, delFlag
-        )
-        VALUES
-          (
-            #{userId}, #{type}, #{beansType}, #{orderId}, #{archiveId},
-            #{num}, #{pushStatus}, #{addTime}, 0
-          )
+        INSERT INTO `user_beans_history` (`userId`, `type`, `beansType`, `orderId`, `archiveId`,
+                                          `num`, `pushStatus`, `addTime`, delFlag)
+        VALUES (#{userId}, #{type}, #{beansType}, #{orderId}, #{archiveId},
+                #{num}, #{pushStatus}, #{addTime}, 0)
     </insert>
 
     <update id="updateClubUser">
         UPDATE
-          user
-        SET
-          bindMobile = #{bindMobile},
-          userPermission = #{userPermission},
-          userIdentity = #{userIdentity},
-          email = #{email},
-          userName = #{userName},
-          source = #{source},
-          password = #{password},
-          registerUserTypeID = #{registerUserTypeId},
-          name = #{name},
-          registerTime = #{registerTime},
-          registerIP = #{registerIp},
-          ipAddress = #{ipAddress},
-          clubStatus = #{clubStatus},
-          serviceProviderStatus = #{serviceProviderStatus},
-          serviceProviderID = #{serviceProviderId},
-          guideFlag = #{guideFlag}
-        WHERE
-          userID = #{userId}
+            user
+        SET bindMobile            = #{bindMobile},
+            userIdentity          = #{userIdentity},
+            email                 = #{email},
+            userName              = #{userName},
+            source                = #{source},
+            password              = #{password},
+            registerUserTypeID    = #{registerUserTypeId},
+            name                  = #{name},
+            registerTime          = #{registerTime},
+            registerIP            = #{registerIp},
+            ipAddress             = #{ipAddress},
+            serviceProviderStatus = #{serviceProviderStatus},
+            serviceProviderID     = #{serviceProviderId},
+            guideFlag             = #{guideFlag}
+        WHERE userID = #{userId}
     </update>
 
     <update id="updateClub">
         UPDATE
-          club
-        SET
-          name = #{name},
-          sname = #{shortName},
-          provinceID = #{provinceId},
-          cityID = #{cityId},
-          townID = #{townId},
-          spID = #{serviceProviderId},
-          address = #{address},
-          linkMan = #{linkMan},
-          contractPhone = #{contractPhone},
-          contractMobile = #{contractMobile},
-          fax = #{fax},
-          contractEmail = #{contractEmail},
-          info = #{profile},
-          addTime = #{addTime},
-          status = #{status},
-          businessLicenseImage = #{businessLicense},
-          defaultServiceProviderID = #{serviceProviderId},
-          mainpro = #{mainProduct},
-          headpic = #{shopPhoto},
-          lastModify = NOW(),
-          socialCreditCode = #{socialCreditCode},
-          department = #{department},
-          medicalPracticeLicenseImg = #{medicalPracticeLicense}
-        WHERE
-          userID = #{userId}
+            club
+        SET name                      = #{name},
+            sname                     = #{shortName},
+            provinceID                = #{provinceId},
+            cityID                    = #{cityId},
+            townID                    = #{townId},
+            spID                      = #{serviceProviderId},
+            address                   = #{address},
+            linkMan                   = #{linkMan},
+            contractPhone             = #{contractPhone},
+            contractMobile            = #{contractMobile},
+            fax                       = #{fax},
+            contractEmail             = #{contractEmail},
+            info                      = #{profile},
+            addTime                   = #{addTime},
+            status                    = #{status},
+            businessLicenseImage      = #{businessLicense},
+            defaultServiceProviderID  = #{serviceProviderId},
+            mainpro                   = #{mainProduct},
+            headpic                   = #{shopPhoto},
+            lastModify                = NOW(),
+            socialCreditCode          = #{socialCreditCode},
+            department                = #{department},
+            medicalPracticeLicenseImg = #{medicalPracticeLicense}
+        WHERE userID = #{userId}
     </update>
     <select id="selProvince" resultType="java.lang.Integer">
-        SELECT provinceID as provinceId FROM province WHERE NAME LIKE concat('%', #{regionPro} ,'%') limit 1
+        SELECT provinceID as provinceId
+        FROM province
+        WHERE NAME LIKE concat('%', #{regionPro}, '%')
+        limit 1
     </select>
     <select id="selCity" resultType="java.lang.Integer">
-        SELECT cityID as cityId FROM city WHERE NAME LIKE concat('%', #{regionCity} ,'%') AND validFlag = 1 limit 1
+        SELECT cityID as cityId
+        FROM city
+        WHERE NAME LIKE concat('%', #{regionCity}, '%')
+          AND validFlag = 1
+        limit 1
     </select>
 </mapper>

+ 0 - 2
src/main/resources/mapper/SellerMapper.xml

@@ -11,7 +11,6 @@
                u.bindMobile     as bindMobile,
                u.email          as email,
                u.guideFlag      as guideFlag,
-               u.userPermission as userPermission,
                u.userIdentity   as userIdentity,
                u.serviceProviderID as serviceProviderId,
                u.serviceProviderStatus as serviceStatus,
@@ -19,7 +18,6 @@
         from user u
         where u.mobile = #{mobile}
           and u.userIdentity = 1
-          and u.userPermission = 4
           and u.validFlag = 1
     </select>
     <update id="updateServiceProviderByUserId">

+ 0 - 7
src/main/resources/mapper/SuperVipMapper.xml

@@ -26,13 +26,6 @@
         values (#{userBeans}, 2, 0, now(), 14, #{userId}, 0)
     </insert>
 
-    <update id="updateUserPermission">
-        update user
-        set userPermission=#{userPermission}
-        where userId = #{userId}
-    </update>
-
-
     <update id="updateUserIdentity">
         update user
         set userIdentity=#{userIdentity}