主导购处理

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/hm/HmLinkDTO.java

@@ -18,7 +18,7 @@ public class HmLinkDTO implements Serializable {
 
     private Long linkId;
     private String linkCode;
-    /**1通用链接 2专用链接*/
+    /**1专用链接 2通用链接*/
     private Integer linkType;
     private String wxEnterpriseId;
     private String enterpriseId;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/hm/TabHmLink.java

@@ -18,7 +18,7 @@ public class TabHmLink implements Serializable {
     private Long linkId;
     private String shortCode ;
     private String linkCode;
-    /**1通用链接 2专用链接*/
+    /**1专用链接 2通用链接*/
     private Integer linkType;
     private String wxEnterpriseId;
     private String enterpriseId;

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
+import java.util.stream.Collectors;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -49,8 +50,10 @@ import com.gic.haoban.manage.service.service.hm.HmLinkStoreService;
 import com.gic.haoban.manage.service.service.hm.HmPageService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeService;
 import com.gic.haoban.manage.service.service.hm.HmQrcodeTempService;
+import com.gic.member.api.dto.MemberClerkDTO;
 import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.member.api.dto.es.MemberStoreClerkDataDTO;
+import com.gic.member.api.service.MemberClerkApiService;
 import com.gic.member.api.service.MemberService;
 import com.gic.redis.data.util.RedisUtil;
 import com.gic.wechat.api.dto.qywx.welcome.QywxExternalcontactDTO;
@@ -88,6 +91,8 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     private HmQrcodeTempService hmQrcodeTempService;
     @Autowired
     private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper;
+    @Autowired
+    private MemberClerkApiService memberClerkApiService ;
 
     @Override
     public ServiceResponse<String> getHmLinkUrl() {
@@ -244,7 +249,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
                     if (null == hm && null != xgStore && CollectionUtils.isNotEmpty(list)) {
                         // 排序协管导购
-                        list = this.sortMemberClerk(list);
+                        list = this.sortMemberClerk(enterpriseId,memberId,list);
                         List<String> storeIdList = new ArrayList<>();
                         // 协管导购
                         for (MemberStoreClerkDataDTO item : list) {
@@ -342,9 +347,14 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         return ServiceResponse.success(retDTO);
     }
 
-    private List<MemberStoreClerkDataDTO> sortMemberClerk(List<MemberStoreClerkDataDTO> list) {
+    private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId , String memberId ,List<MemberStoreClerkDataDTO> list) {
+        ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId, memberId) ;
+        if(!resp.isSuccess() && CollectionUtils.isEmpty(resp.getResult())) {
+            log.info("member主导购={},memberId",resp.getMessage(),memberId) ;
+            return list ;
+        }
         List<MemberStoreClerkDataDTO> retList = new ArrayList<>();
-        List<String> mainClerkIdList = new ArrayList<>();
+        List<String> mainClerkIdList = resp.getResult().stream().map(dto->dto.getClerkId()).collect(Collectors.toList());
         List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>();
         for (MemberStoreClerkDataDTO item : retList) {
             if (mainClerkIdList.contains(item.getClerkIdRel())) {

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

@@ -179,7 +179,7 @@
                      retries="0" check="false"/>
    <dubbo:reference interface="com.gic.enterprise.api.service.EnterpriseUseForbidService" id="enterpriseUseForbidService"/>                  
    <dubbo:reference id="memberTagOpenApiService" interface="com.gic.member.tag.api.service.MemberTagOpenApiService" timeout="10000" retries="0" check="false"/>
-                     
+   <dubbo:reference id="memberClerkApiService" interface="com.gic.member.api.service.MemberClerkApiService" timeout="10000" retries="0" check="false"/>                  
 
 
 </beans>
\ No newline at end of file