跟进记录增加营销记录

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

@@ -139,7 +139,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
             page.setResult(Collections.emptyList());
             return page;
         }
-        int totalCount = list.size();
+        int totalCount = 500;
         int pageSize = pageInfo.getPageSize();
         int pageNum = pageInfo.getPageNum();
         int totalPage = (int) Math.ceil((double) totalCount / pageSize);
@@ -168,7 +168,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
         DateTime startTime = DateUtil.offsetMonth(date, -6);
         BasePageInfo basePage = new BasePageInfo();
         basePage.setPageNum(1);
-        basePage.setPageNum(sizeTotal);
+        basePage.setPageSize(sizeTotal);
         ServiceResponse<Page<AiMemberLogListDTO>> aiRes = aiMemberLogApiService.pageAiMemberMarketingLog(memberId, "", aiThirdStatus,
                 DateUtil.formatDate(startTime), DateUtil.formatDate(date), new HashMap<>(), basePage);
         if (aiRes != null && aiRes.getResult() != null && CollectionUtils.isNotEmpty(aiRes.getResult().getResult())) {
@@ -207,7 +207,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
             followDTO = new ContactFollowDTO();
             followDTO.setMemberId(aiMemberLog.getMemberId());
             followDTO.setFollowType(ContactFollowTypeEnum.AI.getCode());
-            followDTO.setFollowRemark(ContactFollowTypeEnum.AI.getDescription());
+            followDTO.setFollowRemark(ContactFollowTypeEnum.AI.getTextMatch());
             followDTO.setFollowTime(aiMemberLog.getAiTime());
             followDTO.setEnterpriseId(enterpriseId);
             list.add(followDTO);
@@ -223,7 +223,7 @@ public class ContactFollowServiceImpl implements ContactFollowService {
             followDTO = new ContactFollowDTO();
             followDTO.setMemberId(smsLog.getMemberId());
             followDTO.setFollowType(ContactFollowTypeEnum.SMS.getCode());
-            followDTO.setFollowRemark(ContactFollowTypeEnum.SMS.getDescription());
+            followDTO.setFollowRemark(ContactFollowTypeEnum.SMS.getTextMatch());
             followDTO.setFollowTime(smsLog.getCreateDate());
             followDTO.setEnterpriseId(enterpriseId);
             list.add(followDTO);
@@ -245,8 +245,8 @@ public class ContactFollowServiceImpl implements ContactFollowService {
             convertAiFollow(enterpriseId, aiRes.getResult(), followDTOList);
         }
 
-//        List<MemberSmsLogDTO> smsList = smsService.lastMemberSmsLog(enterpriseId, memberIdList, null, DateUtil.beginOfDay(startTime), DateUtil.endOfDay(date), new HashMap<>());
-//        convertSmsFollow(enterpriseId, smsList, followDTOList);
+        List<MemberSmsLogDTO> smsList = smsService.lastMemberSmsLog(enterpriseId, memberIdList, null, DateUtil.beginOfDay(startTime), DateUtil.endOfDay(date), new HashMap<>());
+        convertSmsFollow(enterpriseId, smsList, followDTOList);
 
         Map<String, ContactFollowDTO> map = followDTOList.stream()
                 .sorted(Comparator