zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangjinlei
2022-04-19 10:27:05 +08:00
parent 1e5ce5b3b2
commit 6937919d48
1 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
application/api/controller/Article.php
View File

@@ -457,16 +457,16 @@ class Article extends Controller {
$tt .= 'The author changed the manuscript’s status, please check.<br><br>';
$tt .= 'TMR Publishing Group';
$sendUser=[
'title'=> $journal_info['title'], // 邮件标题
'content'=>$tt,//邮件内容
'user_id'=>$user_res['user_id'], //收件人ID
'email'=>$editor_info['email'],// 收件人邮箱
'journal_id'=>$journal_info['journal_id'], // 期刊ID
'sendEmail'=>$journal_info['email'], // 期刊邮箱
'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title']
];
// $sendUser=[
// 'title'=> $journal_info['title'], // 邮件标题
// 'content'=>$tt,//邮件内容
// 'user_id'=>$user_res['user_id'], //收件人ID
// 'email'=>$editor_info['email'],// 收件人邮箱
// 'journal_id'=>$journal_info['journal_id'], // 期刊ID
// 'sendEmail'=>$journal_info['email'], // 期刊邮箱
// 'sendPassword'=>$journal_info['epassword'], // 期刊密码
// 'from_name'=>$journal_info['title']
// ];
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt,$journal_info['email'],$journal_info['epassword']);
@@ -514,7 +514,7 @@ class Article extends Controller {
* @param name:username type:string require:1 desc:作者账号名
* @param name:articleId type:int require:1 desc:文章id
* @param name:picturesAndTables type:string require:1 desc:Figures
* @param name: $name Description
* @param name:manuscirpt type:string require:1 desc:文章文件
*
*/
public function RepairBack(){
@@ -530,6 +530,7 @@ class Article extends Controller {
$inset_data['state'] = 1;
$where['article_id'] = $data['articleId'];
$up_res = $this->article_obj->where($where)->update($inset_data);
$article_info = $this->article_obj->where($where)->find();
$journal_info = $this->journal_obj->where("journal_id",$article_info["journal_id"])->find();
@@ -547,17 +548,17 @@ class Article extends Controller {
$tt .= 'The author changed the manuscript’s status, please check.<br><br>';
$tt .= 'TMR Publishing Group';
$sendUser=[
'title'=> $journal_info['title'], // 邮件标题
'content'=>$tt,//邮件内容
'user_id'=>$user_res['user_id'], //收件人ID
'email'=>$editor_info['email'],// 收件人邮箱
'journal_id'=>$journal_info['journal_id'], // 期刊ID
'sendEmail'=>$journal_info['email'], // 期刊邮箱
'sendPassword'=>$journal_info['epassword'], // 期刊密码
'from_name'=>$journal_info['title']
];
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
// $sendUser=[
// 'title'=> $journal_info['title'], // 邮件标题
// 'content'=>$tt,//邮件内容
// 'user_id'=>$user_res['user_id'], //收件人ID
// 'email'=>$editor_info['email'],// 收件人邮箱
// 'journal_id'=>$journal_info['journal_id'], // 期刊ID
// 'sendEmail'=>$journal_info['email'], // 期刊邮箱
// 'sendPassword'=>$journal_info['epassword'], // 期刊密码
// 'from_name'=>$journal_info['title']
// ];
// Queue::push('app\api\job\domail@fire',$sendUser,'domail');
$res2 = self::save_article_file($data['articleId'], $user_res['user_id'], $user_res['account'], $data['picturesAndTables'], 'picturesAndTables');
@@ -573,12 +574,12 @@ class Article extends Controller {
//增加usermsg
$umsg_res=add_usermsg($journal_info['editor_id'], 'The manuscript has new process: ' . $article_info['title'], '/articleDetailEditor?id=' . $article_info['article_id']);
if($up_res&&$msg_res&&$res2&&$res3&&$log_res&&$umsg_res){
if($msg_res&&$res2&&$res3&&$log_res&&$umsg_res){
Db::commit();
return json(['code' => 0]);
}else{
Db::rollback();
return json(['code' => 1]);
return jsonError("system error!");
}
}