Merge remote-tracking branch 'origin/master-xgh-好办停用' into developer

Conflicts:
	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/ExternalClerkRelatedServiceImpl.java

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

@@ -23,4 +23,15 @@ public interface HaobanTimerApiService {
      */
     public ServiceResponse<Void> deleteTempWxHm(String params) ;
     
+    /**
+     * 
+    * @Title: repairExternalUserId
+    * @Description: 检查修复外部联系人ID
+    * @author xugh
+    * @param wxEnterpriseId
+    * @return
+    * @throws
+     */
+    public ServiceResponse<Void> repairExternalUserId(String wxEnterpriseId) ;
+    
 }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/MemberUnionidRelatedMapper.java

@@ -62,4 +62,6 @@ public interface MemberUnionidRelatedMapper {
      */
     List<MemberUnionidRelated> listByWxEnterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId);
     
+    List<MemberUnionidRelated> listByWxEnterpriseIdAndExternalUserId(@Param("wxEnterpriseId") String wxEnterpriseId , @Param("list")List<String> externalUserIdList);
+
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanExternalClerkRelatedMapper.java

@@ -355,4 +355,6 @@ public interface TabHaobanExternalClerkRelatedMapper {
     int countByMemberId(@Param("memberId") String memberId,
                         @Param("enterpriseId") String enterpriseId);
     
+    List<TabHaobanExternalClerkRelated> listPageByWxenterpriseId(@Param("wxEnterpriseId") String wxEnterpriseId,
+            @Param("startItem") int startItem , @Param("pageSize") int pageSize );
 }
\ No newline at end of file

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

@@ -71,4 +71,6 @@ public interface ExternalClerkRelatedService {
 	 */
 	String checkAndUpdateMemberByUnonId(String enterpriseId, String memberId, String unionId);
 
+    void repairExternalUserId(String wxEnterpriseId);
+
 }

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

@@ -6,8 +6,6 @@ import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 
 import java.util.List;
 
-import org.apache.ibatis.annotations.Param;
-
 public interface WxEnterpriseService {
 	
 	String add(WxEnterpriseDTO wxDTO);

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

@@ -5,6 +5,7 @@ import org.springframework.stereotype.Service;
 
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.service.HaobanTimerApiService;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
 
 @Service("haobanTimerApiService")
@@ -13,10 +14,21 @@ public class HaobanTimerApiServiceImpl implements HaobanTimerApiService {
     @Autowired
     private HmQrcodeTempService  hmQrcodeTempService ;
     
+    @Autowired
+    private ExternalClerkRelatedService externalClerkRelatedService ;
+    
+    
     @Override
     public ServiceResponse<Void> deleteTempWxHm(String params) {
         this.hmQrcodeTempService.deleteForTimer(); 
         return ServiceResponse.success();
     }
     
+    @Override
+    public ServiceResponse<Void> repairExternalUserId(String wxEnterpriseId) {
+        this.externalClerkRelatedService.repairExternalUserId(wxEnterpriseId) ;
+        return ServiceResponse.success();
+    }
+   
+
 }

haoban-manage3-service/src/main/resources/mapper/MemberUnionidRelatedMapper.xml

@@ -186,4 +186,15 @@
         and status_flag = 1
     </select>
     
+    <select id="listByWxEnterpriseIdAndExternalUserId" resultMap="BaseResultMap">
+    	select
+           external_userid,  self_external_userid from tab_haoban_member_unionid_related
+        where wx_enterprise_id = #{wxEnterpriseId}
+        and external_userid in 
+         <foreach collection="list" item="id" index="index" open="(" close=")" separator=",">
+            #{id,jdbcType=VARCHAR}
+        </foreach>
+        and status_flag = 1
+    </select>
+
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanExternalClerkRelatedMapper.xml

@@ -661,4 +661,10 @@
           and status_flag = 1
     </select>
     
+    
+    <select id="listPageByWxenterpriseId" resultMap="BaseResultMap">
+        select DISTINCT(external_user_id)  from tab_haoban_external_clerk_related where wx_enterprise_id = #{wxEnterpriseId}  and status_flag = 1
+        limit ${startItem},${pageSize} 
+    </select>
+
 </mapper>
\ No newline at end of file

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

+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
@@ -7,7 +16,6 @@ import com.gic.haoban.manage.api.dto.hm.HmGroupQueryDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageDTO;
 import com.gic.haoban.manage.api.dto.hm.HmPageRelationDTO;
 import com.gic.haoban.manage.api.dto.hm.HmWelcomeRelationDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.hm.HmPageRelationQDTO;
 import com.gic.haoban.manage.api.dto.welcome.qdto.QueryWelcomeRelationQDTO;
 import com.gic.haoban.manage.api.enums.hm.HmWelcomeReferType;
@@ -18,15 +26,8 @@ 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.pojo.bo.hm.HmWelcomeRelationBO;
+import com.gic.haoban.manage.service.service.ExternalClerkRelatedService;
 import com.gic.haoban.manage.service.service.hm.WelcomeRelationService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.Arrays;
-import java.util.List;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
@@ -45,11 +46,14 @@ public class HmPageServiceTest {
     private HmWelcomeRelationApiService welcomeRelationApiService;
     @Autowired
     private WxEnterpriseApiService wxEnterpriseApiService ;
+    @Autowired
+    private ExternalClerkRelatedService externalClerkRelatedService ;
 
     @Test
     public void test(){
        
-        this.wxEnterpriseApiService.stopHaoban("ff8080815dacd3a2015dacd3ef5c0000");
+        this.externalClerkRelatedService.repairExternalUserId("218a8a6c2ca14e28a1053f541be0e49d,ca66a01b79474c40b3e7c7f93daf1a3b");
+     //   this.wxEnterpriseApiService.stopHaoban("ff80808182c3a46b0182c3a4ea7d0000");
         
      /*   HmPageQDTO pageQDTO = new HmPageQDTO();
         pageQDTO.setPageSearchText("MB01419872763172380673");