From 1e2a08c410a5fe8e244c721d5ff2b597937d38df Mon Sep 17 00:00:00 2001
From: chengxl <chengxl@example.com>
Date: Thu, 4 Dec 2025 16:43:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Article.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php
index 6e52e3e..d0cdd92 100644
--- a/application/api/controller/Article.php
+++ b/application/api/controller/Article.php
@@ -95,6 +95,7 @@ class Article extends Base
         if ($data['name'] != '') {
             $where['t_article.title'] = array('like', "%" . $data['name'] . "%");
         }
+
         //分页查询数据
         $limit_start = ($data['pageIndex'] - 1) * $data['pageSize'];
         $res = $this->article_obj->field('t_article.*,t_journal.title journalname')
@@ -103,6 +104,7 @@ class Article extends Base
             ->order('article_id desc')
             ->limit($limit_start, $data['pageSize'])->select();
         $count = $this->article_obj->where($where)->count();
+
         foreach ($res as $key => $val) {
             //查询建议转投详情
             $transfer_info = $this->article_transfer_obj
@@ -499,7 +501,7 @@ class Article extends Base
         $data = $this->request->post();
         //查询文章基础数据
         $where['t_article.article_id'] = $data['articleId'];
-        $article_res = $this->article_obj->field('t_article.*,t_journal.title journalname,t_user.account')->join(array(['t_journal', 't_journal.journal_id = t_article.journal_id', 'LEFT'], ['t_user', 't_user.user_id = t_article.user_id', 'LEFT']))->where($where)->find();
+        $article_res = $this->article_obj->field('t_article.*,t_journal.title journalname,t_user.account,t_user.email as user_email')->join(array(['t_journal', 't_journal.journal_id = t_article.journal_id', 'LEFT'], ['t_user', 't_user.user_id = t_article.user_id', 'LEFT']))->where($where)->find();
         //查询文章状态跟踪信息
         $article_msg = $this->article_msg_obj->where(['article_id' => $data['articleId']])->where('state', 0)->select();
         //查询审稿人审稿建议
@@ -1586,15 +1588,10 @@ class Article extends Base
                 $this->addProductionEx($data['articleId']);
                 $this->addArticleMainEx($data['articleId']);
 
-                //处理缴费相关信息
-                if($journal_info['fee']==0){
+                //如果是免费的期刊文章，那么直接变成付款完成
+                if ($journal_info['fee'] == 0 || $article_info['ctime'] < 1735660800) {
                     $this->article_obj->where("article_id", $article_info['article_id'])->update(["is_buy" => 1]);
-                }else{
-                    $this->article_obj->where("article_id", $article_info['article_id'])->update(["fee" => $journal_info['fee']]);
                 }
-//                if ($journal_info['fee'] == 0 || $article_info['ctime'] < 1735660800) {
-//                    $this->article_obj->where("article_id", $article_info['article_id'])->update(["is_buy" => 1]);
-//                }
             }
         }