Merge remote-tracking branch 'origin/master'

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

@@ -192,7 +192,8 @@
     <dubbo:reference interface="com.gic.marketing.api.service.AccountOverdueSmsSendService" id="accountOverdueSmsSendService" timeout="10000" retries="0"/>
     <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,10 +25,9 @@ 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"})
@@ -48,16 +47,13 @@ public class HmPageServiceTest {
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService ;
     @Autowired
-    private QywxExternalUserService qywxExternalUserService ;
-    @Autowired
-    private Config config ;
+    private ExternalClerkRelatedService externalClerkRelatedService ;
 
     @Test
     public void test(){
-        
-      //  this.wxEnterpriseApiService.stopHaoban("ff8080815dacd3a2015dacd3ef5c0000");
-        System.out
-                .println(JSON.toJSONString(this.qywxExternalUserService.externalUseridToPendingId("wp59NLDQAAWfAU-uhldYZyNZnPXz_1xg", config.getWxSuiteid(), Arrays.asList("wm59NLDQAAAI39Od3hmd81FyMMxJcGuw","wm59NLDQAA10rEOdSvUZVxte8j0SNEAA")) ));;
+       
+        this.externalClerkRelatedService.repairExternalUserId("218a8a6c2ca14e28a1053f541be0e49d,ca66a01b79474c40b3e7c7f93daf1a3b");
+     //   this.wxEnterpriseApiService.stopHaoban("ff80808182c3a46b0182c3a4ea7d0000");
         
      /*   HmPageQDTO pageQDTO = new HmPageQDTO();
         pageQDTO.setPageSearchText("MB01419872763172380673");

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

@@ -358,6 +358,16 @@ public class WxEnterpriseInfoController extends WebBaseController {
     public HaobanResponse getInfoByMemberCode(GetUserByMemberCodeQo qo) {
         logger.info("会员小程序={}", JSON.toJSONString(qo));
         String gicEnterpriseId = qo.getGicEnterpriseId();
+        if(StringUtils.isNotEmpty(gicEnterpriseId)) {
+            if(this.wxEnterpriseApiService.haobanIsStop(gicEnterpriseId)) {
+                HaobanResponse response = new HaobanResponse() ;
+                response.setErrorCode(-888);
+                String msg = this.wxEnterpriseApiService.getEndDate(gicEnterpriseId) ;
+                response.setMessage(msg);
+                response.setDetailError(msg);
+                return response;
+            }
+        }
         WxEnterpriseDTO enterpriseDTO = null;
         if (StringUtils.isNotBlank(qo.getCorpId())) {
             enterpriseDTO = wxEnterpriseApiService.getEnterpriseBycorpId(qo.getCorpId());