Sfoglia il codice sorgente

正品联盟资料库优化part6

Aslee 3 anni fa
parent
commit
713ce8ae7f

+ 1 - 0
src/main/java/com/caimei/config/ApiConfig.java

@@ -34,6 +34,7 @@ public class ApiConfig implements WebMvcConfigurer {
 //                .excludePathPatterns("/order/shareCode");
         registry.addInterceptor(wxApiInterceptor)
                 .addPathPatterns("/wx/data/**")
+                .addPathPatterns("/wx/user/token/check")
                 .excludePathPatterns("/wx/data/feedback/submit");
     }
 }

+ 1 - 1
src/main/java/com/caimei/mapper/ClubMapper.java

@@ -30,7 +30,7 @@ public interface ClubMapper {
 
     Integer getStatusByClubUserId(Integer clubUserId);
 
-    List<WxClubListVo> getWxClubList(@Param("authUserId") Integer authUserId, @Param("clubName") String clubName);
+    List<WxClubListVo> getWxClubList(@Param("appId") String appId, @Param("clubName") String clubName);
 
     Integer checkMobile(@Param("mobile") String mobile, @Param("appId") String appId);
 

+ 2 - 2
src/main/java/com/caimei/service/AuthClubService.java

@@ -59,13 +59,13 @@ public interface AuthClubService {
 
     /**
      * 微信公众号机构列表
-     * @param authUserId    供应商用户id
+     * @param appId         供应商公众号appId
      * @param clubName      机构名称
      * @param pageNum       第几页
      * @param pageSize      一页多少条
      * @return
      */
-    ResponseJson<PageInfo<WxClubListVo>> getWxClubList(Integer authUserId, String clubName, Integer pageNum, Integer pageSize);
+    ResponseJson<PageInfo<WxClubListVo>> getWxClubList(String appId, String clubName, Integer pageNum, Integer pageSize);
 
     /**
      * 提交反馈

+ 3 - 3
src/main/java/com/caimei/service/impl/AuthClubServiceImpl.java

@@ -101,12 +101,12 @@ public class AuthClubServiceImpl implements AuthClubService {
     }
 
     @Override
-    public ResponseJson<PageInfo<WxClubListVo>> getWxClubList(Integer authUserId, String clubName, Integer pageNum, Integer pageSize) {
-        if (null == authUserId) {
+    public ResponseJson<PageInfo<WxClubListVo>> getWxClubList(String appId, String clubName, Integer pageNum, Integer pageSize) {
+        if (null == appId) {
             return ResponseJson.error("参数异常,请输入供应商用户id", null);
         }
         PageHelper.startPage(pageNum, pageSize);
-        List<WxClubListVo> clubList = clubMapper.getWxClubList(authUserId, clubName);
+        List<WxClubListVo> clubList = clubMapper.getWxClubList(appId, clubName);
         PageInfo<WxClubListVo> pageData = new PageInfo<>(clubList);
         return ResponseJson.success(pageData);
     }

+ 6 - 0
src/main/java/com/caimei/wxController/LoginApi.java

@@ -67,4 +67,10 @@ public class LoginApi {
         String appId = parseObject.getString("appId");
         return loginService.loginByInvitationCode(mobile, verifyCode, invitationCode, accessToken, openId, appId);
     }
+
+    @ApiOperation("校验token是否失效")
+    @PostMapping("/token/check")
+    public ResponseJson checkToken(){
+        return ResponseJson.success("token有效");
+    }
 }

+ 3 - 3
src/main/java/com/caimei/wxController/WxAuthApi.java

@@ -32,16 +32,16 @@ public class WxAuthApi {
 
     @ApiOperation("已认证机构列表")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "authUserId", required = true, value = "供应商用户id"),
+            @ApiImplicitParam(name = "appId", required = true, value = "供应商公众号appId"),
             @ApiImplicitParam(name = "clubName", required = false, value = "机构名称"),
             @ApiImplicitParam(name = "pageNum", required = false, value = "第几页"),
             @ApiImplicitParam(name = "pageSize", required = false, value = "一页多少条")
     })
     @GetMapping("/club/list")
-    public ResponseJson<PageInfo<WxClubListVo>> getWxClubList(Integer authUserId, String clubName,
+    public ResponseJson<PageInfo<WxClubListVo>> getWxClubList(String appId, String clubName,
                                                               @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        return authClubService.getWxClubList(authUserId, clubName, pageNum, pageSize);
+        return authClubService.getWxClubList(appId, clubName, pageNum, pageSize);
     }
 
 

+ 7 - 5
src/main/resources/mapper/ClubMapper.xml

@@ -65,13 +65,15 @@
     </select>
     <select id="getWxClubList" resultType="com.caimei.model.vo.WxClubListVo">
         select id as authId, authParty as clubName
-        from cm_brand_auth
-        where authUserId = #{authUserId}
-        and status = 1
+        from cm_brand_auth a
+        left join cm_brand_auth_user au on a.authUserId = au.authUserId
+        where au.appId = #{appId}
+        and a.status = 1
+        and au.status = 1
         <if test="clubName != null and clubName != ''">
-            and authParty like concat('%',#{clubName},'%')
+            and a.authParty like concat('%',#{clubName},'%')
         </if>
-        order by createTime desc
+        order by a.createTime desc
     </select>
     <select id="checkMobile" resultType="java.lang.Integer">
         select cu.id as clubUserId from cm_brand_club_user cu