Merge branch 'master-xgh-好办停用' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

# Conflicts:
#	haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml
#	haoban-manage3-service/src/test/java/HmPageServiceTest.java

haoban-manage3-service/src/main/resources/dubbo-haoban-manage-service.xml

@@ -193,5 +193,6 @@
     <dubbo:reference interface="com.gic.thirdparty.api.service.VoiceService" id="voiceService" timeout="10000" retries="0"/>
     <dubbo:reference interface="com.gic.thirdparty.api.service.CommunicationService" id="communicationService" timeout="10000" retries="0"/>
     <dubbo:reference interface="com.gic.member.api.service.MemberEntranceApiService" id="memberEntranceApiService" timeout="10000" retries="0"/>
+    <dubbo:reference interface="com.gic.wechat.api.service.qywx.QywxExternalUserService" id="qywxExternalUserService" timeout="10000" retries="0"/>
 
 </beans>
\ No newline at end of file

haoban-manage3-service/src/test/java/HmPageServiceTest.java

@@ -25,9 +25,10 @@ import com.gic.haoban.manage.api.service.hm.HmGroupApiService;
 import com.gic.haoban.manage.api.service.hm.HmPageApiService;
 import com.gic.haoban.manage.api.service.hm.HmQrcodeApiService;
 import com.gic.haoban.manage.api.service.hm.HmWelcomeRelationApiService;
+import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.pojo.bo.hm.HmWelcomeRelationBO;
-import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
+import com.gic.wechat.api.service.qywx.QywxExternalUserService;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
@@ -47,13 +48,16 @@ public class HmPageServiceTest {
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService ;
     @Autowired
-    private ExternalClerkRelatedService externalClerkRelatedService ;
+    private QywxExternalUserService qywxExternalUserService ;
+    @Autowired
+    private Config config ;
 
     @Test
     public void test(){
-       
-        this.externalClerkRelatedService.repairExternalUserId("218a8a6c2ca14e28a1053f541be0e49d,ca66a01b79474c40b3e7c7f93daf1a3b");
-     //   this.wxEnterpriseApiService.stopHaoban("ff80808182c3a46b0182c3a4ea7d0000");
+        
+      //  this.wxEnterpriseApiService.stopHaoban("ff8080815dacd3a2015dacd3ef5c0000");
+        System.out
+                .println(JSON.toJSONString(this.qywxExternalUserService.externalUseridToPendingId("wp59NLDQAAWfAU-uhldYZyNZnPXz_1xg", config.getWxSuiteid(), Arrays.asList("wm59NLDQAAAI39Od3hmd81FyMMxJcGuw","wm59NLDQAA10rEOdSvUZVxte8j0SNEAA")) ));;
         
      /*   HmPageQDTO pageQDTO = new HmPageQDTO();
         pageQDTO.setPageSearchText("MB01419872763172380673");