邮件修改
This commit is contained in:
@@ -20,36 +20,31 @@ class domail {
|
||||
* @param type $data
|
||||
*/
|
||||
public function send($data){
|
||||
$res = sendEmail($data['email'],$data['title'],$data['from_name'],$data['content'],$data['sendEmail'],$data['sendPassword'],$data['attachmentFile']='');
|
||||
$insert = [
|
||||
'title'=>$data['title'],
|
||||
'content'=>$data['content'],
|
||||
'recive_id'=>$data['user_id'],
|
||||
'recive_email'=>$data['email'],
|
||||
'journal_id'=>$data['journal_id'],
|
||||
'journal_email'=>$data['sendEmail'],
|
||||
'journal_password'=>$data['sendPassword'],
|
||||
'create_time'=>time()
|
||||
];
|
||||
if(isset($data['attachment_url'])){
|
||||
if(isset($data['attachment_url']) && !empty($data['attachment_url']) ){
|
||||
$res = sendEmail($data['email'],$data['title'],$data['from_name'],$data['content'],$data['sendEmail'],$data['sendPassword'],$data['attachment_url']);
|
||||
$insert['is_attachment'] = 1;
|
||||
$insert['attachment_url'] = $data['attachment_url'];
|
||||
}else{
|
||||
$res = sendEmail($data['email'],$data['title'],$data['from_name'],$data['content'],$data['sendEmail'],$data['sendPassword']);
|
||||
}
|
||||
if(isset($data['journal_id'])){
|
||||
$insert['journal_id'] = $data['journal_id'];
|
||||
}
|
||||
|
||||
if($res['status']==1){
|
||||
$info = Db::name('email')->insert($insert);
|
||||
if(!$info){
|
||||
Log::write($insert,'thanksEmailError');
|
||||
}
|
||||
Db::name('email')->insert($insert);
|
||||
return true;
|
||||
}else{
|
||||
$insert['is_success'] = 0;
|
||||
$insert['fail_reason'] = $res['data'];
|
||||
$info = Db::name('email')->insert($insert);
|
||||
if(!$info){
|
||||
Log::write($insert,'thanksEmailError');
|
||||
}
|
||||
Db::name('email')->insert($insert);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,6 +87,15 @@ class review {
|
||||
$np_num++;
|
||||
}
|
||||
}
|
||||
// 发邮件
|
||||
$sendUser=[
|
||||
'title'=>$journal_info['title'], // 邮件标题
|
||||
'journal_id'=>$journal_info['journal_id'], // 期刊ID
|
||||
'sendEmail'=>$journal_info['email'], // 期刊邮箱
|
||||
'sendPassword'=>$journal_info['epassword'], // 期刊密码
|
||||
'from_name'=>$journal_info['title']
|
||||
];
|
||||
|
||||
//分情况执行
|
||||
if ($all == 0) {
|
||||
//分配两次审稿人
|
||||
@@ -124,23 +133,35 @@ class review {
|
||||
$tt .= 'Email: '.$journal_info['email'].'<br>';
|
||||
$tt .= 'Website: '.$journal_info['website'];
|
||||
// sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $user_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
//$maidata['email'] = $user_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $user_info['user_id'];
|
||||
$sendUser['email'] = $user_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
return true;
|
||||
} elseif ($np_num == 2) {//不通过
|
||||
//发送邮件通知编辑
|
||||
$tt = 'Reviewers final opinions on the manuscript ID'.$data['accept_sn'].' are rejection. Please login and deal with the next step of this manuscript manually.';
|
||||
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $editor_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
//$maidata['email'] = $editor_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $editor_info['user_id'];
|
||||
$sendUser['email'] = $editor_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
return true;
|
||||
} else {//一样一个增加一个审稿案例
|
||||
$this->add_reviewer($data);
|
||||
@@ -173,23 +194,35 @@ class review {
|
||||
$tt .= 'Email: '.$journal_info['email'].'<br>';
|
||||
$tt .= 'Website: '.$journal_info['website'];
|
||||
// sendEmail($user_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $user_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
//$maidata['email'] = $user_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $user_info['user_id'];
|
||||
$sendUser['email'] = $user_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
return true;
|
||||
} else {//不通过
|
||||
//发送邮件通知编辑
|
||||
$tt = 'Reviewers final opinions on the manuscript ID'.$data['accept_sn'].' are rejection. Please login and deal with the next step of this manuscript manually.';
|
||||
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $editor_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
//$maidata['email'] = $editor_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $editor_info['user_id'];
|
||||
$sendUser['email'] = $editor_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -203,18 +236,33 @@ class review {
|
||||
$editor_info = $this->user_obj->where('user_id', $article['editor_id'])->find();
|
||||
//根据文章筛选候选人
|
||||
$reviewer = $this->chose_reviewer($article);
|
||||
// 发送邮件
|
||||
$sendUser=[
|
||||
'title'=>$journal_info['title'], // 邮件标题
|
||||
'journal_id'=>$journal_info['journal_id'], // 期刊ID
|
||||
'sendEmail'=>$journal_info['email'], // 期刊邮箱
|
||||
'sendPassword'=>$journal_info['epassword'], // 期刊密码
|
||||
'from_name'=>$journal_info['title']
|
||||
];
|
||||
|
||||
if ($reviewer == null) {//没有查询到审稿人,执行提醒操作
|
||||
//发送邮件到编辑,提醒需要手动添加审稿案例
|
||||
$tt = 'Dear editor,<br>';
|
||||
$tt .= 'There are no enough research area related reviewers in the reviewer list for manuscript ID ' . $article['accept_sn'] . ', please add reviewers for your journal or manual deal with this problem.<br><br>';
|
||||
$tt .= 'TMR Publishing Group';
|
||||
// sendEmail($editor_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $editor_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
//$maidata['email'] = $editor_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $editor_info['user_id'];
|
||||
$sendUser['email'] = $editor_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
} else {//查询到审稿人,执行添加操作
|
||||
//将审稿时间定义至现在
|
||||
$this->user_obj->where('user_id', $reviewer['user_id'])->update(['rtime' => time()]);
|
||||
@@ -256,12 +304,17 @@ class review {
|
||||
$tt .= 'Email:' . $journal_info['email'] . '<br>';
|
||||
$tt .= 'Website:' . $journal_info['website'];
|
||||
// sendEmail($reviewer_info['email'], $journal_info['title'], $journal_info['title'], $tt, $journal_info['email'], $journal_info['epassword']);
|
||||
$maidata['email'] = $reviewer_info['email'];
|
||||
$maidata['title'] = $journal_info['title'];
|
||||
$maidata['content'] = $tt;
|
||||
$maidata['tmail'] = $journal_info['email'];
|
||||
$maidata['tpassword'] = $journal_info['epassword'];
|
||||
Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
//$maidata['email'] = $reviewer_info['email'];
|
||||
//$maidata['title'] = $journal_info['title'];
|
||||
//$maidata['content'] = $tt;
|
||||
//$maidata['tmail'] = $journal_info['email'];
|
||||
//$maidata['tpassword'] = $journal_info['epassword'];
|
||||
//Queue::push('app\api\job\mail@fire', $maidata, "mail");
|
||||
|
||||
$sendUser['content'] = $tt;
|
||||
$sendUser['user_id'] = $reviewer_info['user_id'];
|
||||
$sendUser['email'] = $reviewer_info['email'];
|
||||
Queue::push('app\api\job\domail@fire',$sendUser,'domail');
|
||||
|
||||
//记录userlog
|
||||
$log_data['user_id'] = $article_info['editor_id'];
|
||||
|
||||
Reference in New Issue
Block a user