朋友圈

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/MomentDataExcelHandler.java

@@ -16,6 +16,8 @@ import com.gic.haoban.manage.api.qdto.moment.QwMomentPlanQDTO;
 import com.gic.haoban.manage.api.service.moment.QwMomentApiService;
 import com.gic.haoban.manage.web.vo.moment.MomentDataExcelVO;
 import com.gic.haoban.manage.web.vo.moment.MomentPlanExcelVO;
+import com.gic.haoban.manage.web.vo.moment.QwMomentPlanDataVO;
+import com.gic.member.api.dto.es.MemberDataDTO;
 import com.gic.web.common.download.DownloadHandlerAbstract;
 import com.gic.web.common.download.context.Context;
 import org.apache.commons.collections.CollectionUtils;
@@ -23,10 +25,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Service
 public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataExcelVO> {
@@ -36,6 +36,8 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
 
     @Autowired
     private StoreService storeService  ;
+    @Autowired
+    private QwMomentController qwMomentController ;
 
 
     @Override
@@ -47,7 +49,6 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
         ServiceResponse<Page<QwMomentPlanDataDTO>> pageResp = this.qwMomentApiService.dataList(qdto);
         List<MomentDataExcelVO> voList = new ArrayList<>();
         if (null != pageResp && CollectionUtils.isNotEmpty(pageResp.getResult().getResult())) {
-            EnterpriseDTO en = this.enterpriseService.getEnterpriseById(qdto.getEnterpriseId()) ;
             for(QwMomentPlanDataDTO item : pageResp.getResult().getResult()) {
                 MomentDataExcelVO vo = EntityUtil.changeEntityByJSON(MomentDataExcelVO.class,item) ;
                 if(qdto.getType()==1 && null != vo.getLikeTime()) {
@@ -63,6 +64,22 @@ public class MomentDataExcelHandler extends DownloadHandlerAbstract<MomentDataEx
                 }
                 voList.add(vo) ;
             }
+            List<String> memberIdList = voList.stream().map(o->o.getMemberId()).collect(Collectors.toList());
+            Map<String, MemberDataDTO> map = this.qwMomentController.getMemberMap(qdto.getEnterpriseId(),memberIdList) ;
+            for (MomentDataExcelVO vo : voList) {
+                String memberId = vo.getMemberId() ;
+                if(null == map.get(memberId)) {
+                    vo.setMemberScene(2);
+                }else {
+                    MemberDataDTO data = map.get(memberId) ;
+                    vo.setMemberName(data.getName());
+                    vo.setMemberNick(data.getNickName());
+                    vo.setMemberCard(data.getCardNo());
+                    vo.setMemberImage(data.getDefineHeadImg());
+                    vo.setMemberPhone(data.getPhoneNumber());
+                    vo.setMemberScene(3);
+                }
+            }
         }
         return voList;
     }

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java

@@ -48,7 +48,6 @@ import com.gic.search.engine.api.service.dynamic.ESDataDynamicOperationApiServic
 import com.gic.web.common.download.DownloadTask;
 import com.gic.web.common.download.DownloadTaskUtil;
 import com.gic.web.common.download.constants.TaskTypeEnum;
-import com.gic.web.common.utils.SessionContextUtils;
 import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/moment/MomentDataExcelVO.java

 package com.gic.haoban.manage.web.vo.moment;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.gic.web.common.jsonSeralizer.CardNoJsonSeralizer;
+import com.gic.web.common.jsonSeralizer.PhoneNumberJsonSeralizer;
+import com.gic.web.common.jsonSeralizer.UserNameJsonSeralizer;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -31,10 +36,13 @@ public class MomentDataExcelVO implements Serializable {
 	private String clerkName;
 	/**客户id*/
 	private String memberId;
+	@JsonSerialize(using = UserNameJsonSeralizer.class)
 	private String memberName ;
 	private String memberNick ;
+	@JsonSerialize(using = CardNoJsonSeralizer.class)
 	private String memberCard ;
 	private String memberImage ;
+	@JsonSerialize(using = PhoneNumberJsonSeralizer.class)
 	private String memberPhone ;
 
 	/**是否删除*/

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/moment/QwMomentPlanDataVO.java

 package com.gic.haoban.manage.web.vo.moment;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.gic.web.common.jsonSeralizer.CardNoJsonSeralizer;
+import com.gic.web.common.jsonSeralizer.PhoneNumberJsonSeralizer;
+import com.gic.web.common.jsonSeralizer.UserNameJsonSeralizer;
+
 import java.io.Serializable ;
 import java.util.Date;
 
@@ -30,10 +35,13 @@ public class QwMomentPlanDataVO implements Serializable{
 	private String clerkName;
 	/**客户id*/
 	private String memberId;
+	@JsonSerialize(using = UserNameJsonSeralizer.class)
 	private String memberName ;
 	private String memberNick ;
+	@JsonSerialize(using = CardNoJsonSeralizer.class)
 	private String memberCard ;
 	private String memberImage ;
+	@JsonSerialize(using = PhoneNumberJsonSeralizer.class)
 	private String memberPhone ;
 
 	/**是否删除*/