Merge branch 'feat-1002556' into 'master'

1002556

See merge request rays/pcloud-book!536

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageBizImpl.java

 package com.pcloud.book.personalstage.biz.impl;
 
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
 import com.pcloud.book.base.exception.BookBizException;
 import com.pcloud.book.consumer.content.ResourceConsr;
 import com.pcloud.book.consumer.wechatgroup.WechatGroupConsr;
@@ -24,11 +25,7 @@ import com.pcloud.book.personalstage.dao.PersonalStageReplyDao;
 import com.pcloud.book.personalstage.dao.PersonalStageReplyItemDao;
 import com.pcloud.book.personalstage.dao.PersonalStageUserDao;
 import com.pcloud.book.personalstage.dao.PersonalStageWakeupDao;
-import com.pcloud.book.personalstage.dto.FusingFinishDelayDTO;
-import com.pcloud.book.personalstage.dto.PersonalStageDTO;
-import com.pcloud.book.personalstage.dto.PersonalStageJumpKeywordDto;
-import com.pcloud.book.personalstage.dto.PersonalStageProgressDTO;
-import com.pcloud.book.personalstage.dto.WakeupDelayDTO;
+import com.pcloud.book.personalstage.dto.*;
 import com.pcloud.book.personalstage.entity.PersonalStage;
 import com.pcloud.book.personalstage.entity.PersonalStageProgressMessage;
 import com.pcloud.book.personalstage.entity.PersonalStageReply;
@@ -45,6 +42,7 @@ import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.mq.DelayQueueDTO;
 import com.pcloud.common.exceptions.BizException;
 import com.pcloud.common.page.PageBean;
+import com.pcloud.common.page.PageBeanNew;
 import com.pcloud.common.page.PageParam;
 import com.pcloud.common.utils.DateUtils;
 import com.pcloud.common.utils.ListUtils;
@@ -315,6 +313,17 @@ public class PersonalStageBizImpl implements PersonalStageBiz {
                 PersonalStageDTO linkup = linkupCountMap.get(stageDTO.getId());
                 stageDTO.setJumpLinkupCount(linkup.getJumpLinkupCount());
             }
+            //阶段跳转信息
+            HashMap<String, Object> map = Maps.newHashMap();
+            map.put("personalStageId", stageDTO.getId());
+            PageBeanNew<PersonalStageJumpDto> pageBeanNew = personalStageJumpDao.listPageNew(new PageParam(0, 3), map, "getJumpList");
+            if (null == pageBeanNew || ListUtils.isEmpty(pageBeanNew.getRecordList())){
+                stageDTO.setPersonalStageJumpDtos(new ArrayList<>());
+                stageDTO.setPersonalStageJumpCount(0);
+            }else {
+                stageDTO.setPersonalStageJumpDtos(pageBeanNew.getRecordList());
+                stageDTO.setPersonalStageJumpCount(pageBeanNew.getTotalCount());
+            }
         }
         return pageBean;
     }

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/biz/impl/PersonalStageJumpBizImpl.java

@@ -622,9 +622,7 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
             emailList.add("leibin@dcrays.cn");
             emailList.add("zhoulei@dcrays.cn");
         }else {
-            emailList.add("hyy_8062@163.com");
             emailList.add("zhoulei@dcrays.cn");
-            emailList.add("312949619@qq.com");
         }
         SendEmailDto sendEmailDto = new SendEmailDto();
         sendEmailDto.setTypeCode("feedback_notice_email");

pcloud-service-book/src/main/java/com/pcloud/book/personalstage/dto/PersonalStageDTO.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 
 @ApiModel("定制化阶段")
@@ -52,4 +53,10 @@ public class PersonalStageDTO extends BaseDto {
 
     @ApiModelProperty("衔接语条数")
     private Integer jumpLinkupCount;
+
+    @ApiModelProperty("阶段跳转信息-最多展示3条")
+    private List<PersonalStageJumpDto> personalStageJumpDtos;
+
+    @ApiModelProperty("阶段跳转数量")
+    private Integer personalStageJumpCount;
 }
\ No newline at end of file