feat: 会员接口替换

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/content/impl/PotentialCustomerServiceImpl.java

@@ -132,7 +132,7 @@ public class PotentialCustomerServiceImpl implements PotentialCustomerService {
     }
 
     private Map<String, String> queryMemberExtendInfo(String enterpriseId, List<String> memberIds) {
-        List<MemberDataEnum> returnFields = Arrays.asList(MemberDataEnum.member_id, MemberDataEnum.member_photoUrl);
+        List<String> returnFields = Arrays.asList(MemberDataEnum.member_id.getCode(), MemberDataEnum.member_photoUrl.getCode());
         List<MemberDataDTO> memberDataDTOS = memberQueryService.queryMemberBatch(enterpriseId, memberIds, StringUtils.join(returnFields, ","));
         if (CollectionUtils.isEmpty(memberDataDTOS)) {
             return Collections.emptyMap();

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

@@ -76,8 +76,8 @@ public class MemberQueryServiceImpl implements MemberQueryService {
         ESResponseQueryBatch queryBatch = esApiService.queryDataBatch(search, false, null);
         if (CollectionUtils.isEmpty(queryBatch.getRes())) {
             return Collections.emptyList();
-        }
 
+        }
         return queryBatch.getRes()
                 .stream()
                 .map(item -> item.toJavaObject(MemberDataDTO.class))

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

@@ -11,6 +11,8 @@ import com.gic.haoban.manage.service.service.MemberQueryService;
 import com.gic.haoban.manage.service.service.content.MaterialReportService;
 import com.gic.haoban.manage.service.service.content.adaptor.MaterialDataAdaptor;
 import com.gic.member.api.dto.es.MemberDataDTO;
+import com.gic.search.engine.api.constant.MemberDataEnum;
+import org.apache.commons.lang3.StringUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,6 +20,7 @@ import org.springframework.data.domain.PageRequest;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -112,7 +115,11 @@ public class MaterialReportServiceTest {
     @Test
     public void queryMemberInfo(){
 
-        List<MemberDataDTO> memberDataDTOS = memberQueryService.queryMemberBatch(eid, Collections.singletonList("ff8080818147efc8018148d1759903c8"), null);
+//        List<MemberDataDTO> memberDataDTOS = memberQueryService.queryMemberBatch(eid, Collections.singletonList("ff8080818147efc8018148d1759903c8"), null);
+//        System.out.println(JSON.toJSONString(memberDataDTOS));
+
+        List<String> returnFields = Arrays.asList(MemberDataEnum.member_id.getCode(), MemberDataEnum.member_photoUrl.getCode());
+        List<MemberDataDTO> memberDataDTOS = memberQueryService.queryMemberBatch(eid, Collections.singletonList("ff8080818147efc8018148d1759903c8"), StringUtils.join(returnFields, ","));
         System.out.println(JSON.toJSONString(memberDataDTOS));
     }
 }