Commit 1341f385b8a81d26a360a59b57651049a0726a24

Authored by 王言钊
1 parent 3bc7a784

修改业务

src/main/java/com/cnlive/shenhe/serviceImpl/VideosServiceImpl.java
@@ -462,7 +462,7 @@ public class VideosServiceImpl { @@ -462,7 +462,7 @@ public class VideosServiceImpl {
462 // List<Integer> shyActivities = shyActivityImpl.selectByExample(CommonConst.AUDIT_TYPE_FREE); 462 // List<Integer> shyActivities = shyActivityImpl.selectByExample(CommonConst.AUDIT_TYPE_FREE);
463 logger.info("====sites:{}", sites.toString()); 463 logger.info("====sites:{}", sites.toString());
464 String source = shyVideo.getSource(); 464 String source = shyVideo.getSource();
465 - // 根据source 查询审核类型 465 + // 根据source 查询审核类型 source有传空的时候 默认给0
466 Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source)); 466 Integer shType = shyActivityImpl.selectBySource(StringUtils.isEmpty(source) ? 0 : Integer.valueOf(source));
467 logger.info("审核类型为:{}", shType); 467 logger.info("审核类型为:{}", shType);
468 ShyUsersfree shyUserfree = null; 468 ShyUsersfree shyUserfree = null;
@@ -473,7 +473,7 @@ public class VideosServiceImpl { @@ -473,7 +473,7 @@ public class VideosServiceImpl {
473 //初始化一个审核状态 473 //初始化一个审核状态
474 //审核类型,1:免审,2:机审,3:人工审 474 //审核类型,1:免审,2:机审,3:人工审
475 Integer shenheType = CommonConst.AUDIT_TYPE_USER; 475 Integer shenheType = CommonConst.AUDIT_TYPE_USER;
476 - //如果当前sp是免审sp source有传空的时候 默认给0 //如果存在免审用户 476 + //如果当前sp是免审sp //如果审核类型为免审 //如果存在免审用户
477 if (sites.contains(shyVideo.getSpid()) || (CommonUtils.isNotNull(shType) && CommonConst.AUDIT_TYPE_FREE.equals(shType)) || CommonUtils.isNotNull(shyUserfree)) { 477 if (sites.contains(shyVideo.getSpid()) || (CommonUtils.isNotNull(shType) && CommonConst.AUDIT_TYPE_FREE.equals(shType)) || CommonUtils.isNotNull(shyUserfree)) {
478 logger.info("进入已经免审渠道:{}", source); 478 logger.info("进入已经免审渠道:{}", source);
479 //免审 479 //免审
@@ -485,14 +485,20 @@ public class VideosServiceImpl { @@ -485,14 +485,20 @@ public class VideosServiceImpl {
485 shenheType = CommonConst.AUDIT_TYPE_MACHANE; 485 shenheType = CommonConst.AUDIT_TYPE_MACHANE;
486 // 如果是人工审 486 // 如果是人工审
487 if (CommonConst.AUDIT_TYPE_USER.equals(shType)) { 487 if (CommonConst.AUDIT_TYPE_USER.equals(shType)) {
488 - shenheType = shType; 488 + shenheType = CommonConst.AUDIT_TYPE_USER;
489 } 489 }
490 // 如果栏目是朋友圈 490 // 如果栏目是朋友圈
491 } else if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_MOMENT)) { 491 } else if (CommonUtils.isNotEmpty(shyVideo.getCategory()) && shyVideo.getCategory().equals(CommonConst.CATEGORY_MOMENT)) {
492 // 免审 492 // 免审
493 shenheType = CommonConst.AUDIT_TYPE_FREE; 493 shenheType = CommonConst.AUDIT_TYPE_FREE;
494 } else { 494 } else {
495 - shenheType = shType; 495 + if (shType != null) {
  496 + // 机审或者是人工审
  497 + shenheType = shType;
  498 + } else {
  499 + // 人工审核
  500 + shenheType = CommonConst.AUDIT_TYPE_USER;
  501 + }
496 } 502 }
497 } 503 }
498 logger.info("id : {} 审核类型: {}", shyVideo.getVideo_id(), shenheType); 504 logger.info("id : {} 审核类型: {}", shyVideo.getVideo_id(), shenheType);