From f7f6836d88f3a7003415591389949209f2a0d628 Mon Sep 17 00:00:00 2001
From: qinzexin <“731344816@qq.com”>
Date: Thu, 10 Jul 2025 18:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A2=9E=E5=87=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/controller/school/NewActivity.php      |  5 +++++
 .../school/newactivity/ActivityDrafts.php      |  9 +++++++--
 .../common/model/school/activity/Activity.php  | 18 ++++++++++++++++--
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/application/api/controller/school/NewActivity.php b/application/api/controller/school/NewActivity.php
index 9a4d6dc..664acd0 100644
--- a/application/api/controller/school/NewActivity.php
+++ b/application/api/controller/school/NewActivity.php
@@ -271,6 +271,8 @@ class NewActivity extends Base
     public function add(){
 
         $this->transactionCheck();
+        file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')."  ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND);
+
 
         //敏感词过滤
         $this->checkSensitivewords(["title","content"]);
@@ -356,6 +358,9 @@ class NewActivity extends Base
     public function edit($ids = null){
         if(!$ids) $ids = $this->request->post('ids/d', 0);
 
+        file_put_contents('activity'.date('Y_m_d').'.log',date('Y-m-d H:i:s')."  ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND);
+
+
         $this->transactionCheck();
 
         //敏感词过滤
diff --git a/application/api/controller/school/newactivity/ActivityDrafts.php b/application/api/controller/school/newactivity/ActivityDrafts.php
index dc673bf..2be42b5 100644
--- a/application/api/controller/school/newactivity/ActivityDrafts.php
+++ b/application/api/controller/school/newactivity/ActivityDrafts.php
@@ -194,6 +194,7 @@ class ActivityDrafts extends Base
     public function add(){
 
 //        $this->transactionCheck();
+        file_put_contents('activityDrafts'.date('Y_m_d').'.log',date('Y-m-d H:i:s')."  ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND);
 
         //敏感词过滤
         $this->checkSensitivewords(["title","content"]);
@@ -228,8 +229,7 @@ class ActivityDrafts extends Base
         $params["sign_time"] =  $this->request->post('sign_time/s', 0);
         $params["time"] =  $this->request->post('time/s', 0);
 
-
-        //classes_type
+       //classes_type
 
         try{
             if(!config("site.miniapp_activity_swtich")) $this->error("已关闭发布渠道，请联系管理员后台添加！");
@@ -273,6 +273,9 @@ class ActivityDrafts extends Base
      */
     public function edit($ids = null){
         if(!$ids) $ids = $this->request->post('ids/d', 0);
+
+        file_put_contents('activityDrafts'.date('Y_m_d').'.log',date('Y-m-d H:i:s')."  ".json_encode($this->request->post()).PHP_EOL,FILE_APPEND);
+
         //敏感词过滤
         $this->checkSensitivewords(["title","content"]);
 
@@ -308,6 +311,8 @@ class ActivityDrafts extends Base
         $params["sign_time"] =  $this->request->post('sign_time/s', 0);
         $params["time"] =  $this->request->post('time/s', 0);
 
+
+
         try{
             if(!config("site.miniapp_activity_swtich")) $this->error("已关闭发布渠道，请联系管理员后台添加！");
 
diff --git a/application/common/model/school/activity/Activity.php b/application/common/model/school/activity/Activity.php
index d5a072f..e471ec4 100644
--- a/application/common/model/school/activity/Activity.php
+++ b/application/common/model/school/activity/Activity.php
@@ -394,6 +394,8 @@ class Activity extends BaseModel
 
             $split_line = " - ";
             $time_arr = explode($split_line,$time);
+            if(!$time_arr)
+
             $params["sign_start_time"] = $time_arr[0] ;
             $params["sign_end_time"] = $time_arr[1];
             unset($params["sign_time"]);
@@ -544,6 +546,13 @@ class Activity extends BaseModel
     $params["content"] = preg_replace($pattern, '', $params["content"]);
 }
 
+      if(!empty( $params["cate_ids"])){
+          $cate_count = Cate::where("id" ,"in",$params["cate_ids"])->count();
+          if($cate_count != count(explode(",", $params["cate_ids"]))){
+              throw new \Exception("平台分类不存在");
+          }
+      }
+
 
 
 
@@ -1359,10 +1368,15 @@ class Activity extends BaseModel
 //            $row = self::get($id);
 //            var_dump($row["audit_status"]);
             //如果审核状态是审核中，并且时间已经到了3=待开始,4=进行中，则活动自动取消
-            if(($row["status"]=='3' || $row["status"]=='4' || $row["status"]=='-1') && $row["auth_status"]=='0'){
+            if(($row["status"]=='3' || $row["status"]=='4') && $row["auth_status"]=='0'){
                   //直接改为审核失败
                 $row["auth_time"] = time();
-                $row["reason"] = "超期系统自动审核失败，请重发该活动";
+                if($row["status"]=='-1'){
+                    $row["reason"] = "主动取消审核自动失败";
+                }else{
+                    $row["reason"] = "超期系统自动审核失败，请重发该活动";
+                }
+
                 $row["auth_status"] = 2;
                 $row->save();
                 //审核不通过