Merge branch 'fix-1021512' into 'master'

fix-1021512: 配置阶段跳转时不是关键词跳转的不保存关键词

See merge request rays/pcloud-book!512

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

@@ -126,7 +126,8 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
         PersonalStageJump personalStageJump = CreateStageJumpRequestVO.valueToJumpEntity(vo);
         personalStageJumpDao.insert(personalStageJump);
         List<PersonalStageJumpKeyword> jumpKeywords = BaseStageJumpRequestVO.valueToJumpKeywords(vo, personalStageJump.getId());
-        if (!ListUtils.isEmpty(jumpKeywords)) {
+        if (!ListUtils.isEmpty(jumpKeywords) && !JumpTypeEnum.PAY_TRIGGER.key.equals(vo.getJumpType())
+                && !JumpTypeEnum.PAPER_TRIGGER.key.equals(vo.getJumpType())) {
             personalStageJumpKeywordDao.batchInsert(jumpKeywords);
         }
         List<PersonalStageJumpEmail> jumpEmails = BaseStageJumpRequestVO.valueToJumpEmails(vo, personalStageJump.getId());
@@ -225,7 +226,8 @@ public class PersonalStageJumpBizImpl implements PersonalStageJumpBiz {
         //删除原有的衔接语
         personalStageJumpLinkupDao.deleteByJumpId(vo.getPersonalStageJumpId());
         List<PersonalStageJumpKeyword> jumpKeywords = BaseStageJumpRequestVO.valueToJumpKeywords(vo, personalStageJump.getId());
-        if (!ListUtils.isEmpty(jumpKeywords)){
+        if (!ListUtils.isEmpty(jumpKeywords) && !JumpTypeEnum.PAY_TRIGGER.key.equals(vo.getJumpType())
+                && !JumpTypeEnum.PAPER_TRIGGER.key.equals(vo.getJumpType())){
             personalStageJumpKeywordDao.batchInsert(jumpKeywords);
         }
         List<PersonalStageJumpEmail> jumpEmails = BaseStageJumpRequestVO.valueToJumpEmails(vo, personalStageJump.getId());