机审对人工已审内容不做覆盖

宋亚南
1 parent f05e6754
Showing 2 changed files with 8 additions and 4 deletions
src/main/java/com/cnlive/shenhe/job/YiDunUrlResultJob.java
src/main/java/com/cnlive/shenhe/service/serviceImpl/ContentServiceImpl.java
@@ -174,7 +174,7 @@ public class YiDunUrlResultJob {
                                 newYiDunMsg.setDesc_msg(desc.toString());
                                 newYiDunMsg.setCheck_status(2);
                                 //修改图文状态
-                                contentService.callback(String.valueOf(shyContent.getId()), desc.toString(), CommonConst.AUDIT_REFUSE, "", shyContent.getUpdater());
+                                contentService.callback(String.valueOf(shyContent.getId()), desc.toString(), CommonConst.AUDIT_REFUSE, "00001", shyContent.getUpdater());
                             }
                         } catch (NumberFormatException e) {
                             e.printStackTrace();
@@ -259,10 +259,14 @@ public class ContentServiceImpl implements ContentService {
         boolean success = true;
         ShyContent content = shyContentMapper.selectByPrimaryKey(Integer.parseInt(contentId));
         logger.info("contentId:{},content:{}", contentId, content);
-        if (content != null && (CommonConst.RECEIVE_AUDIT.equals(content.getReceive_status()) || CommonConst.RECEIVE_AFTER.equals(content.getReceive_status()))) {
-            logger.error("图文审核回调成功但已人工审/领取，图文id:{}", content.getId());
-            return success;
+        if ("00001".equals(userId)) {
+            if (content != null && content.getShenhe_type() == 3) {
+                logger.error("图文审核回调成功但已人工处理，图文id:{}", content.getId());
+                return success;
+            }
+            userId = "";
         }
+
         JSONObject result = new JSONObject();
         try {
             if (CommonUtils.isNotEmpty(content.getContent_tag()) && "content".equals(content.getContent_tag())) {