建联转化记录

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/contact/impl/ContactOrderServiceImpl.java

@@ -118,17 +118,23 @@ public class ContactOrderServiceImpl implements ContactOrderService {
         if (CollectionUtils.isEmpty(list)) {
             return new ArrayList<>();
         }
-        Set<String> memberIdSet = list.stream().map(TabContactOrder::getMemberId)
-                .filter(StringUtils::isNotBlank)
-                .collect(Collectors.toSet());
+        Set<String> memberIdSet = new HashSet<>();
         Map<String, ClerkDTO> clerkIdMap = new HashMap<>();
         Map<String, StoreDTO> storeIdMap = new HashMap<>();
         Map<String, MemberDataDTO> memberMap = new HashMap<>();
         Set<String> storeIdSet = new HashSet<>();
         Set<String> clerkIdSet = new HashSet<>();
+        for (TabContactOrder contactOrder : list) {
+            String memberId = contactOrder.getMemberId();
+            String storeId = contactOrder.getStoreId();
+            if (StringUtils.isBlank(memberId)) {
+                memberIdSet.add(memberId);
+            }
+            storeIdSet.add(storeId);
+        }
         // 组装商品信息
         if (CollectionUtils.isNotEmpty(memberIdSet)) {
-            List<MemberDataDTO> memberList = esMemberInfoService.queryDataBatch(enterpriseId, Lists.newArrayList(memberIdSet), "memberId,name,cardNo,phoneNumber,nickName,mainClerkId,mainStoreId");
+            List<MemberDataDTO> memberList = esMemberInfoService.queryDataBatch(enterpriseId, Lists.newArrayList(memberIdSet), "memberId,name,cardNo,phoneNumber,nickName,photoUrl,mainClerkId,mainStoreId");
             for (MemberDataDTO memberDataDTO : memberList) {
                 memberMap.put(memberDataDTO.getMemberId(), memberDataDTO);
                 String mainClerkId = memberDataDTO.getMainClerkId();
@@ -188,6 +194,14 @@ public class ContactOrderServiceImpl implements ContactOrderService {
                 contactOrderDTO.setMemberName("账号已注销");
                 contactOrderDTO.setMemberDeleteFlag(1);
             }
+            String storeId = contactOrder.getStoreId();
+            if (StringUtils.isNotBlank(storeId)) {
+                StoreDTO storeDTO = storeIdMap.get(storeId);
+                if (storeDTO != null) {
+                    contactOrderDTO.setStoreCode(storeDTO.getStoreCode());
+                    contactOrderDTO.setStoreName(storeDTO.getStoreName());
+                }
+            }
             dtoList.add(contactOrderDTO);
         }
         return dtoList;