bugfix

src/main/java/com/caimei365/user/model/po/UserPo.java

@@ -68,6 +68,10 @@ public class UserPo implements Serializable {
      * 用户权限: 2会员机构 3供应商 4协销 5普通机构
      */
     private Integer userPermission;
+    /**
+     * 是否已经引导过(机构升级:0否，1是)
+     */
+    private Integer guideFlag;
     /**
      * 组织名称
      */

src/main/java/com/caimei365/user/service/impl/BaseServiceImpl.java

@@ -104,7 +104,7 @@ public class BaseServiceImpl implements BaseService {
         String result = ValidateUtil.validateMobile(mobile);
         if (result != null) {return ResponseJson.error(result);}
         // 检查图片验证码
-        if (null != isCheckCaptcha && isCheckCaptcha == 1){
+        if (null != isCheckCaptcha && isCheckCaptcha != 1){
             Boolean checkFlag = checkCaptchaImage(token, imgCode, platformType);
             if (!checkFlag) {
                 return ResponseJson.error("图片验证码错误");
@@ -161,7 +161,7 @@ public class BaseServiceImpl implements BaseService {
         String result = ValidateUtil.validateMobile(mobile);
         if (result != null) {return ResponseJson.error(result);}
         // 检查图片验证码
-        if (null != isCheckCaptcha && isCheckCaptcha == 1){
+        if (null != isCheckCaptcha && isCheckCaptcha != 1){
             Boolean checkFlag = checkCaptchaImage(token, imgCode, platformType);
             if (!checkFlag) {
                 return ResponseJson.error("图片验证码错误");

src/main/java/com/caimei365/user/service/impl/RegisterServiceImpl.java

@@ -134,6 +134,8 @@ public class RegisterServiceImpl implements RegisterService{
         user.setUserIdentity(4);
         // 用户权限: 2会员机构 3供应商 4协销 5普通机构
         user.setUserPermission(5);
+        // 是否已经引导过(机构升级:0否，1是)
+        user.setGuideFlag(0);
         // 设置机构上线
         user.setClubStatus(90);
         // 设置密码
@@ -481,6 +483,11 @@ public class RegisterServiceImpl implements RegisterService{
             user.setName(onlineDto.getName());
             // 邮箱
             user.setEmail(email);
+            // 是否已经引导过(机构升级:0否，1是)
+            user.setGuideFlag(1);
+        } else {
+            // 是否已经引导过(机构升级:0否，1是)
+            user.setGuideFlag(0);
         }
         /* 保存数据库 user */
         int insertUserFlag = registerMapper.insertClubUser(user);

src/main/resources/mapper/RegisterMapper.xml

@@ -2,8 +2,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`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`, `clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`)
-                  values(#{organizeId},#{registerTime},#{registerIp},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus})
+        insert into user(`userOrganizeID`,`registerTime`,`registerIP`, `source`, `registerUserTypeID`, `name`, `userName`, `bindMobile`, `email`, `userIdentity`, `userPermission`,`guideFlag`,`clubStatus`, `password`, `agreeFlag`, `validFlag`, `serviceProviderID`, `serviceProviderStatus`)
+                  values(#{organizeId},#{registerTime},#{registerIp},#{source},#{registerUserTypeId},#{name},#{userName},#{bindMobile},#{email},#{userIdentity},#{userPermission},#{guideFlag},#{clubStatus},#{password},#{agreeFlag},#{validFlag},#{serviceProviderId},#{serviceProviderStatus})
     </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`)