Merge branch 'feature/社群' into 'feature/获取用户敏感信息'

Feature/社群

See merge request !868

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/TestController.java

@@ -79,6 +79,11 @@ public class TestController extends WebBaseController {
     private QwFriendApiService qwFriendApiService ;
     
     
+    @RequestMapping("/qwcode")
+    public HaobanResponse qwcode(String enterpriseId, String unionid,String openid,String wxaUnionid ,String code) {
+        return this.resultResponse(HaoBanErrCode.ERR_0,code);
+    }
+    
     @RequestMapping("/pending-check")
     public HaobanResponse pendingChec(String enterpriseId, String unionid,String openid,String wxaUnionid ,String wxaOpenid) {
         return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.pendingIdCheck(enterpriseId, unionid, openid, wxaUnionid,wxaOpenid));
@@ -384,6 +389,19 @@ public class TestController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_0, map) ;
     }
     
+    
+    @RequestMapping("test-qw-post-suite")
+    public HaobanResponse testQwPostSuite(String url , String corpid , String json) {
+        if(isProd()) {
+            return null ;
+        }
+        String token = qywxCorpApiService.getSuiteAccessToken(config.getWxSuiteid()) ;
+        logger.info("toekn={},corpId={} , url={} , json={}",token, corpid ,(url + token) , json);
+        Map<String, Object> map = HttpClient.getWinxinResByJson(url + token ,json);
+        return resultResponse(HaoBanErrCode.ERR_0, map) ;
+    }
+    
+    
     @RequestMapping("test-qw-token")
     public HaobanResponse testQwPost3(String corpid ,  String secret) {
         if(StringUtils.isBlank(secret)) {
@@ -406,6 +424,18 @@ public class TestController extends WebBaseController {
         return resultResponse(HaoBanErrCode.ERR_0, map) ;
     }
     
+    
+    @RequestMapping("test-qw-get-suite")
+    public HaobanResponse testQwGetSuite(String url , String corpid) {
+        if(isProd()) {
+            return null ;
+        }
+        String token = qywxCorpApiService.getSuiteAccessToken(config.getWxSuiteid()) ;
+        logger.info("toekn={},appid={} , url={} , json={}",token,corpid ,(url + token));
+        Map<String, Object> map = HttpClient.getHttpByGet(url + token);
+        return resultResponse(HaoBanErrCode.ERR_0, map) ;
+    }
+    
     @RequestMapping("test-qw-post-dk")
     public HaobanResponse testQwPostdk(String url , String corpid , String secret, String json) {
         if(isProd()) {

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -643,7 +643,11 @@ public class WxEnterpriseInfoController extends WebBaseController {
         memberSendMessageVo.setSelfExteralUserId(externalUserid);
         memberSendMessageVo.setTitle(settingDTO.getTitle());
         memberSendMessageVo.setWxaHandUrl(enterpriseDTO.getMallMiniprogramLogoUrl());
-        memberSendMessageVo.setBindFlag(clerkRelatedDTO.getStatusFlag() == 1 ? 1 : 0);
+        int bindFlag = 0 ;
+        if(clerkRelatedDTO.getStatusFlag()==1 && StringUtils.isNotBlank(clerkRelatedDTO.getMemberId())) {
+            bindFlag = 1 ;
+        }
+        memberSendMessageVo.setBindFlag(bindFlag);
         memberSendMessageVo.setWxaName(settingDTO.getMiniprogramName());
         return resultResponse(HaoBanErrCode.ERR_1, memberSendMessageVo);
     }