导购

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

@@ -256,6 +256,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     String mainStoreId = member.getMainStoreId();
                     // 服务门店
                     if (null != fwStore) {
+                        log.info("处理服务门店逻辑");
                         if (fwStore.getZs() == 1 && StringUtils.isNotBlank(mainClerkId)) {
                             hm = this.getHmFromClerk(mainClerkId, wxEnterpriseId);
                         }
@@ -269,6 +270,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                     // 协管门店
                     List<MemberStoreClerkDataDTO> list = member.getStoreClerkRel();
                     if (null == hm && null != xgStore && CollectionUtils.isNotEmpty(list)) {
+                        log.info("处理协管门店逻辑");
                         // 排序协管导购
                         list = this.sortMemberClerk(enterpriseId, memberId, list);
                         List<String> storeIdList = new ArrayList<>();
@@ -286,6 +288,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
                             }
                             storeIdList.add(item.getStoreIdRel());
                         }
+                        log.info("");
                         // 店长
                         if (null == hm && xgStore.getDz() == 1 && CollectionUtils.isNotEmpty(storeIdList)) {
                             for (String storeId : storeIdList) {
@@ -399,6 +402,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
     
     private List<MemberStoreClerkDataDTO> sortMemberClerk(String enterpriseId, String memberId,
             List<MemberStoreClerkDataDTO> list) {
+        System.out.println(""); System.out.println("");
         ServiceResponse<List<MemberClerkDTO>> resp = this.memberClerkApiService.getMemberMainClerkList(enterpriseId,
                 memberId);
         if (!resp.isSuccess() && CollectionUtils.isEmpty(resp.getResult())) {
@@ -409,7 +413,7 @@ public class HmLinkApiServiceImpl implements HmLinkApiService {
         List<String> mainClerkIdList = resp.getResult().stream().map(dto -> dto.getClerkId())
                 .collect(Collectors.toList());
         List<MemberStoreClerkDataDTO> notMainClerkList = new ArrayList<>();
-        for (MemberStoreClerkDataDTO item : retList) {
+        for (MemberStoreClerkDataDTO item : list) {
             if (mainClerkIdList.contains(item.getClerkIdRel())) {
                 retList.add(item);
             } else {