From 6abe90ec53f7f512a9486eb39c6489520274e7b1 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 9 Jan 2025 09:25:20 +0800
Subject: [PATCH] 1

---
 application/api/controller/Order.php     | 14 ++++++++++++++
 application/api/controller/Preaccept.php | 24 ++++++++++++++++++++++++
 application/api/controller/Reviewer.php  |  1 +
 composer.json                            |  2 +-
 4 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Order.php b/application/api/controller/Order.php
index 79756a0..2e9746d 100644
--- a/application/api/controller/Order.php
+++ b/application/api/controller/Order.php
@@ -14,6 +14,11 @@ use PaypalServerSdkLib\Models\Builders\PaypalWalletExperienceContextBuilder;
 use PaypalServerSdkLib\Models\Builders\PurchaseUnitRequestBuilder;
 use PaypalServerSdkLib\PaypalServerSdkClientBuilder;
 use think\Db;
+use think\db\exception\DataNotFoundException;
+use think\db\exception\ModelNotFoundException;
+use think\Exception;
+use think\exception\DbException;
+use think\exception\PDOException;
 use think\Queue;
 use think\Validate;
 
@@ -28,6 +33,14 @@ class Order extends base{
 
     }
 
+    /**
+     * @throws DataNotFoundException
+     * @throws ModelNotFoundException
+     * @throws DbException
+     * @throws PDOException
+     * @throws Exception
+     * @throws \Exception
+     */
     public function creatArticleOrder(){
         $data = $this->request->post();
         $rule = new Validate([
@@ -54,6 +67,7 @@ class Order extends base{
             $re['paypal'] = $ii;
             return jsonSuccess($re);
         }
+        $insert['order_sn'] = 'TMR'.date('Ymd') . strtoupper(bin2hex(random_bytes(8)));
         $insert['user_id'] = $article_info['user_id'];
         $insert['type'] = 0;
         $insert["article_id"] = $data['article_id'];
diff --git a/application/api/controller/Preaccept.php b/application/api/controller/Preaccept.php
index 2397e33..3877726 100644
--- a/application/api/controller/Preaccept.php
+++ b/application/api/controller/Preaccept.php
@@ -513,6 +513,30 @@ class Preaccept extends Base
     }
 
 
+    public function getPreacceptPayment(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "article_id"=>"require"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $article_info = $this->article_obj->where("article_id",$data['article_id'])->find();
+        $journal_info = $this->journal_obj->where("journal_id",$article_info['journal_id'])->find();
+        if(intval($journal_info['fee'])==0||$article_info['ctime']<1735660800){
+            $re['state'] = 1;
+            $re['order'] = null;
+            $re["fee"] = 0;
+            return jsonSuccess($re);
+        }
+        $order_info = $this->order_obj->where("article_id",$article_info['article_id'])->find();
+        $re['state'] = $order_info?$order_info['state']:0;
+        $re['fee'] = $journal_info['fee'];
+        $re['order'] = $order_info;
+        return jsonSuccess($re);
+    }
+
+
     public function getArticleMains(){
         $data = $this->request->post();
         $rule = new Validate([
diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php
index 30263b6..747b823 100644
--- a/application/api/controller/Reviewer.php
+++ b/application/api/controller/Reviewer.php
@@ -1399,6 +1399,7 @@ class Reviewer extends Base
             ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'left')
             ->where('t_article_reviewer.reviewer_id', $data['user_id'])
             ->where('t_article_reviewer.state', 5)
+            ->where("t_article.state",2)
             ->select();
         foreach ($res as $k => $v) {
             if ($v['type']) {
diff --git a/composer.json b/composer.json
index 0d269ba..a18f505 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=7.0",
         "topthink/framework": "5.0.*",
         "topthink/think-captcha": "1.*",
         "phpmailer/phpmailer": "^6.9",