From dd1bffa778072a0f892b92f0aba23c6356438559 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 5 Sep 2024 10:37:56 +0800
Subject: [PATCH] 1

---
 application/api/controller/Production.php | 5 +++++
 application/api/job/mail.php              | 2 +-
 application/api/job/ts.php                | 8 ++++++--
 application/common.php                    | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php
index 20426ad..faffbac 100644
--- a/application/api/controller/Production.php
+++ b/application/api/controller/Production.php
@@ -1490,6 +1490,11 @@ class Production extends Base
         return jsonSuccess([]);
     }
 
+    public function mytestDoi(){
+        $info= $this->production_article_refer_obj->where("p_refer_id",86082)->find();
+        my_doiToFrag2($info);
+    }
+
 
     public function mytest11()
     {
diff --git a/application/api/job/mail.php b/application/api/job/mail.php
index 4cf2f85..bbb23cc 100644
--- a/application/api/job/mail.php
+++ b/application/api/job/mail.php
@@ -20,8 +20,8 @@ class mail {
     }
 
     public function promotion(Job $job,$data){
-        $job->delete();
         aliemail($data['email'],$data['title'],$data['content'],$data['has_hb']);
+        $job->delete();
     }
     
     /**
diff --git a/application/api/job/ts.php b/application/api/job/ts.php
index 901a6d2..1d63728 100644
--- a/application/api/job/ts.php
+++ b/application/api/job/ts.php
@@ -9,13 +9,17 @@ class ts {
     //put your code here
 
     public function fire(Job $job, $data) {
-        $job->delete();
         my_doiToFrag($data);
+        $job->delete();
     }
 
     public function fire1(Job $job, $data) {
+        try {
+            my_doiToFrag2($data);
+        } catch (\Exception $e) {
+            $job->delete();
+        }
         $job->delete();
-        my_doiToFrag2($data);
     }
 
 
diff --git a/application/common.php b/application/common.php
index b9af0b9..f0460e4 100644
--- a/application/common.php
+++ b/application/common.php
@@ -656,7 +656,7 @@ function addUserScoreLog($user_id, $score, $content, $ctime, $act = '+')
 function my_doiToFrag2($data)
 {
     $p_refer_obj = Db::name('production_article_refer');
-    if ($data['refer_doi'] == '') {
+    if ($data['refer_doi'] == ''||$data['state']==1) {
         return 0;
     }
     $doi = str_replace('/', '%2F', $data['refer_doi']);