test

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/QwFriendApiService.java

@@ -28,8 +28,11 @@ public interface QwFriendApiService {
     * @return
     * @throws
      */
-    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId, String unionid, String openid, String wxaOpenid);
+    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId, String unionid, String openid,  String wxaUnionid,String wxaOpenid);
+    
+    public ServiceResponse<Map<String,String>> pendingIdCheck(String enterpriseId);
 
+    
     /**
      * 
     * @Title: getPendingIdByUnionid

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/QwFriendApiServiceImpl.java

@@ -46,10 +46,14 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
     @Autowired
     private Config config;
     
+    @Override
+    public ServiceResponse<Map<String, String>> pendingIdCheck(String enterpriseId) {
+        return null;
+    }
 
     @Override
     public ServiceResponse<Map<String, String>> pendingIdCheck(String enterpriseId, String unionid, String openid,
-            String wxaOpenid) {
+           String wxaUnionid, String wxaOpenid) {
         ServiceResponse<WxEnterpriseQwDTO> corpidResp = this.checkAndGetCorpid(enterpriseId);
         if (!corpidResp.isSuccess()) {
             return ServiceResponse.failure(corpidResp.getCode(), corpidResp.getMessage());
@@ -78,7 +82,7 @@ public class QwFriendApiServiceImpl implements QwFriendApiService {
         retMap.put("wxCode", wxCode);
         sb.append("服务号-").append(result).append(",");
         ServiceResponse<PendingIdDTO> wxaResp = this.qywxExternalUserService.unionidToExternalUserid(corpid, suiteid,
-                unionid, wxaOpenid, subjectType);
+                wxaUnionid, wxaOpenid, subjectType);
         if (wxaResp.isSuccess()) {
             result = "ok";
         } else {

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

@@ -80,8 +80,8 @@ public class TestController extends WebBaseController {
     
     
     @RequestMapping("/pending-check")
-    public HaobanResponse pendingChec(String enterpriseId, String unionid,String openid,String wxaOpenid) {
-        return this.resultResponse(HaoBanErrCode.ERR_0,this.qwFriendApiService.pendingIdCheck(enterpriseId, unionid, openid, wxaOpenid));
+    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));
     }
     
     @RequestMapping("/get-pending-times")