fix: setMemberInfo 修正字段名

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

 package com.gic.haoban.manage.web.controller.data;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.clerk.api.dto.ClerkDTO;
@@ -131,6 +132,22 @@ public class CanvasDataController {
         List<CanvasConversionMemberVO> list = page.getResult();
         esMemberInfoUtils.setMemberInfo(qo.getEnterpriseId(), list, Stream.of("clerkCode", "clerkName")
                 .collect(Collectors.toSet()));
+        if (CollectionUtils.isNotEmpty(list)) {
+            Set<String> clerkIds = list.stream().map(CanvasConversionMemberVO::getMbrId).collect(Collectors.toSet());
+            List<ClerkDTO> clerkList = clerkService.getClerkByClerkIds(clerkIds);
+            if (CollUtil.isNotEmpty(clerkList)) {
+                Map<String, ClerkDTO> map = clerkList.stream()
+                        .collect(Collectors.toMap(ClerkDTO::getClerkId, dto -> dto, (k1, k2) -> k1));
+                for (CanvasConversionMemberVO memberVO : list) {
+                    if (!map.containsKey(memberVO.getMbrId())) {
+                        continue;
+                    }
+                    memberVO.setClerkCode(map.get(memberVO.getMbrId()).getClerkCode());
+                    memberVO.setClerkName(map.get(memberVO.getMbrId()).getClerkName());
+                }
+            }
+        }
+
         return RestResponse.successResult(page);
     }
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/utils/EsMemberInfoUtils.java

@@ -52,8 +52,8 @@ public class EsMemberInfoUtils {
                     boolean isQueryStore = fieldName.contains("storeName") || fieldName.contains("storeCode");
                     if (isQueryStore) {
                         List<String> mainStoreIdList = memberJson.stream().
-                                filter(e -> org.apache.commons.lang3.StringUtils.isNotBlank(e.getString("storeId")))
-                                .map(e -> e.getString("storeId")).collect(Collectors.toList());
+                                filter(e -> org.apache.commons.lang3.StringUtils.isNotBlank(e.getString("mainStoreId")))
+                                .map(e -> e.getString("mainStoreId")).collect(Collectors.toList());
                         if (CollectionUtils.isNotEmpty(mainStoreIdList)) {
                             List<StoreDTO> mainStoreList = storeService.queryStore(mainStoreIdList);
                             if (CollectionUtils.isNotEmpty(mainStoreList)) {
@@ -65,8 +65,8 @@ public class EsMemberInfoUtils {
                     boolean isQueryClerk = fieldName.contains("clerkCode") || fieldName.contains("clerkName");
                     if (isQueryClerk) {
                         Set<String> mainClerkIdList = memberJson.stream().
-                                filter(e -> org.apache.commons.lang3.StringUtils.isNotBlank(e.getString("clerkId")))
-                                .map(e -> e.getString("clerkId")).collect(Collectors.toSet());
+                                filter(e -> org.apache.commons.lang3.StringUtils.isNotBlank(e.getString("mainClerkId")))
+                                .map(e -> e.getString("mainClerkId")).collect(Collectors.toSet());
                         if (CollectionUtils.isNotEmpty(mainClerkIdList)) {
                             List<ClerkDTO> mainClerkList = clerkService.getClerkByClerkIds(mainClerkIdList);
                             if (CollectionUtils.isNotEmpty(mainClerkList)) {
@@ -96,7 +96,7 @@ public class EsMemberInfoUtils {
                             }
 
                             if (isQueryStore) {
-                                String mainStoreId = jsonValue.getString("storeId");
+                                String mainStoreId = jsonValue.getString("mainStoreId");
 //                                ReflectUtils.setDateFieldValue(vo, "storeId", mainStoreId);
                                 if (org.apache.commons.lang.StringUtils.isNotBlank(mainStoreId)) {
                                     StoreDTO storeValue = storeMap.get(mainStoreId);
@@ -112,7 +112,7 @@ public class EsMemberInfoUtils {
                             }
 
                             if (isQueryClerk) {
-                                String mainClerkId = jsonValue.getString("clerkId");
+                                String mainClerkId = jsonValue.getString("mainClerkId");
 //                                ReflectUtils.setDateFieldValue(vo, "clerkId", mainClerkId);
                                 if (org.apache.commons.lang.StringUtils.isNotBlank(mainClerkId)) {
                                     ClerkDTO clerkDTO = clerkMap.get(mainClerkId);