引导升级

src/main/java/com/caimei365/user/config/JWTFilter.java

@@ -45,9 +45,7 @@ public class JWTFilter implements WebFilter {
      * 需要权限认证的接口路径
      */
     private static final String[] PERMISSION_URLS = new String[]{
-        "/user/club/info",
         "/user/club/info/update",
-        "/user/shop/info",
         "/user/shop/info/update"
     };
     private RedisService redisService;

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -9,6 +9,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.Map;
+
 
 /**
  * 注册Api
@@ -130,7 +132,6 @@ public class RegisterApi {
      * @param headers   HttpHeaders
      */
     @ApiOperation("协销拉机构上线（机构注册）")
-    @ApiImplicitParam(required = true, name = "isAgreed", value = "是否同意勾选同意协议，1是，其他否")
     @PostMapping("/club/online")
     public ResponseJson clubOnline( ClubOnlineDto onlineDto, @RequestHeader HttpHeaders headers) {
         return registerService.clubOnline(onlineDto, headers);
@@ -191,6 +192,16 @@ public class RegisterApi {
         return registerService.updateShopApply(shopApplyDto, headers);
     }
 
+    /**
+     * 引导升级后改变guideFlag状态
+     * @param userId  用户Id(userId)
+     */
+    @ApiOperation("引导升级后改变guideFlag状态")
+    @ApiImplicitParam(required = true, name = "userId", value = "用户Id")
+    @GetMapping("/guide")
+    public ResponseJson updateGuideFlag(Integer userId){
+        return registerService.updateGuideFlag(userId);
+    }
 }
 
 

src/main/java/com/caimei365/user/mapper/RegisterMapper.java

@@ -86,4 +86,10 @@ public interface RegisterMapper {
      * @param shop
      */
     void updateShopInfoByApply(ShopApplyDto shop);
+
+    /**
+     * 引导升级后改变guideFlag状态
+     * @param userId
+     */
+    void updateGuideFlagByUserId(Integer userId);
 }

src/main/java/com/caimei365/user/model/vo/UserLoginVo.java

@@ -79,6 +79,11 @@ public class UserLoginVo implements Serializable {
      */
     @ApiModelProperty("密码")
     private String password;
+    /**
+     * 是否已经引导过(机构升级:0否，1是)
+     */
+    @ApiModelProperty("是否已经引导过(机构升级:0否，1是)")
+    private Integer guideFlag;
     /**
      * 用户身份: 1协销 2会员机构 3供应商 4普通机构
      */

src/main/java/com/caimei365/user/service/RegisterService.java

@@ -140,4 +140,9 @@ public interface RegisterService {
      */
     ResponseJson updateShopApply(ShopApplyDto shopApplyDto, HttpHeaders headers);
 
+    /**
+     * 引导升级后改变guideFlag状态
+     * @param userId
+     */
+    ResponseJson updateGuideFlag(Integer userId);
 }

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

@@ -160,8 +160,6 @@ public class RegisterServiceImpl implements RegisterService{
         ClubPo club = new ClubPo();
         // 机构名称
         club.setName(user.getUserName());
-        // 机构简称
-        club.setShortName(user.getUserName());
         // 联系手机
         club.setContractMobile(user.getBindMobile());
         // 联系人
@@ -781,5 +779,19 @@ public class RegisterServiceImpl implements RegisterService{
 
     }
 
+    /**
+     * 引导升级后改变guideFlag状态
+     *
+     * @param userId
+     */
+    @Override
+    public ResponseJson updateGuideFlag(Integer userId) {
+        if (userId == null) {
+            return ResponseJson.error("参数错误");
+        }
+        registerMapper.updateGuideFlagByUserId(userId);
+        return ResponseJson.success();
+    }
+
 }
 

src/main/resources/mapper/LoginMapper.xml

@@ -13,6 +13,7 @@
                u.userPermission as userPermission,
                u.userIdentity as userIdentity,
                u.password as password,
+               u.guideFlag as guideFlag,
                u.clubStatus as clubStatus,
                u.manufacturerStatus as shopStatus
         from user u
@@ -31,6 +32,7 @@
             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,
@@ -56,6 +58,7 @@
             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,
@@ -63,9 +66,8 @@
             cu.mobile as operationMobile
         from user u
         left join cm_mall_operation_user cu on cu.userID = u.userID
-        where u.userOrganizeID = 0 and cu.delFlag != 1
-        and (u.bindMobile = #{mobile} or cu.mobile = #{mobile} )
-        and u.userIdentity in (1,2,3,4)
+        where (u.bindMobile = #{mobile} or (cu.mobile = #{mobile} and cu.delFlag != 1))
+        and u.userOrganizeID = 0 and u.userIdentity in (1,2,3,4)
         limit 1
     </select>
     <select id="getServiceProviderUserByOpenId" resultType="com.caimei365.user.model.vo.UserLoginVo">
@@ -77,6 +79,7 @@
                u.email as email,
                u.userPermission as userPermission,
                u.userIdentity as userIdentity,
+               u.guideFlag as guideFlag,
                u.password as password
         from serviceprovider s
         left join user u on s.userID = u.userID
@@ -103,6 +106,7 @@
             u.userPermission as userPermission,
             u.userIdentity as userIdentity,
             u.password as password,
+            u.guideFlag as guideFlag,
             u.clubStatus as clubStatus,
             u.manufacturerStatus as shopStatus,
             o.unionId as unionId,
@@ -135,6 +139,7 @@
             u.userPermission as userPermission,
             u.userIdentity as userIdentity,
             u.password as password,
+            u.guideFlag as guideFlag,
             u.clubStatus as clubStatus,
             u.manufacturerStatus as shopStatus,
             o.unionId as unionId,
@@ -196,6 +201,7 @@
             u.shopID as shopId,
             u.userName as userName,
             u.userIdentity,
+            u.guideFlag as guideFlag,
             u.clubStatus as clubStatus,
             u.manufacturerStatus as shopStatus,
             cou.invitationCodeTime,
@@ -218,6 +224,7 @@
             u.shopID as shopId,
             u.userName as userName,
             u.userIdentity,
+            u.guideFlag as guideFlag,
             u.clubStatus as clubStatus,
             u.manufacturerStatus as shopStatus,
             cou.invitationCodeTime,

src/main/resources/mapper/RegisterMapper.xml

@@ -114,5 +114,8 @@
             status = #{status}
         where shopID = #{shopId}
     </update>
+    <update id="updateGuideFlagByUserId">
+        update user set guideFlag=1 where userID=#{userId}
+    </update>
 
 </mapper>

src/main/resources/mapper/SellerMapper.xml

@@ -9,6 +9,7 @@
             u.mobile as mobile,
             u.bindMobile as bindMobile,
             u.email as email,
+            u.guideFlag as guideFlag,
             u.userPermission as userPermission,
             u.userIdentity as userIdentity,
             u.password as password