合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2116

@@ -10,6 +10,7 @@
 namespace App\Console\Commands\LyhTest;
 
 use App\Console\Commands\Domain\DomainInfo;
+use App\Helper\OaGlobalsoApi;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Models\Ai\AiBlog;
 use App\Models\Ai\AiBlogAuthor;
@@ -58,18 +59,27 @@ class lyhDemo extends Command
 
     public function handle(){
         $projectModel = new Project();
-        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id']);
+        $buildModel = new DeployBuild();
+        $lists = $projectModel->list(['delete_status' => 0,'project_type'=>0,'is_upgrade'=>0,'id'=>['<',1659],'extend_type'=>0,'type'=>['in',[1,2,3,4,6]]], 'id', ['id','notice_order_id']);
         foreach ($lists as $item){
-//            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
-            ProjectServer::useProject($item['id']);
-            $webSettingModel = new WebSetting();
-            $info = $webSettingModel->read(['project_id'=>$item['id']]);
-            if($info === false){
-                $webSettingModel->addReturnId(['project_id'=>$item['id']]);
-                echo '当前数据为空：'.$item['id'].PHP_EOL;
+            echo date('Y-m-d H:i:s') . '开始--项目的id:'. $item['id'] . PHP_EOL;
+            try {
+                if(!empty($item['notice_order_id'])){
+                    $api = new OaGlobalsoApi();
+                    $data = $api->order_info($item['notice_order_id']);
+                    if(!empty($data)){
+                        if(isset($data['data']['ads_price'])){
+                            echo '奖励金额：'.$data['data']['ads_price'].PHP_EOL;
+                            $buildModel->edit(['ads_price'=>$data['data']['ads_price'] ?? 0],['project_id'=>$item['id']]);
+                        }
+                    }
+                }
+            }catch (\Exception $e){
+                continue;
             }
             DB::disconnect('custom_mysql');
         }
+        echo date('Y-m-d H:i:s') . '结束。。。' . PHP_EOL;
     }
 
     public function _actionTemplateMain(){

@@ -81,12 +81,14 @@ class RenewLogic extends BaseLogic
         }
         DB::beginTransaction();
         try {
-            $this->model->edit(['project_id'=>$this->param['id'],'operator_id'=>$this->manager['id']],['id'=>$this->param['renew_id']]);
+            if($this->param['renew_id'] != 0){
+                $this->model->edit(['project_id'=>$this->param['id'],'operator_id'=>$this->manager['id']],['id'=>$this->param['renew_id']]);
+            }
             $param  = $this->param;
             $param['api_no'] = $info['api_no'] ?? 0;
             $this->saveLog($param);
             $this->updateProject($this->param['id'],$this->param['type']);
-            $this->updateProjectBuild($this->param['id'],$this->param['service_duration'],$this->param['plan']);
+            $this->updateProjectBuild($this->param['id'],$this->param['service_duration'] ?? 0,$this->param['plan']);
             DB::commit();
         }catch (\Exception $e){
             DB::rollBack();
@@ -120,12 +122,12 @@ class RenewLogic extends BaseLogic
     public function saveLog($param){
         $data = [
             'renew_id'=>$param['renew_id'],
-            'service_duration'=>$param['service_duration'],
+            'service_duration'=>$param['service_duration'] ?? 0,
             'plan'=>$param['plan'],
             'old_plan'=>$param['old_plan'],
             'type'=>$param['type'],
             'old_type'=>$param['old_type'],
-            'amount'=>$param['amount'],
+            'amount'=>$param['amount'] ?? 0,
             'api_no'=>$param['api_no'],
             'project_id'=>$param['id'],
             'operator_id'=>$this->manager['id'],

@@ -356,17 +356,22 @@ class KeywordLogic extends  BaseLogic
      * @time   :2025/6/9 14:29
      */
     public function saveComment(){
-        $param = [
-            'nickname' => $this->param['nickname'],
-            'text' => $this->param['text'],
-            'project_id' => $this->user['project_id'],
-            'type' => 1,
-            'uid' => 0,
-            'created_at' => date('Y-m-d H:i:s'),
-            'updated_at' => date('Y-m-d H:i:s')
-        ];
         $keywordCommonModel = new AggregateKeywordComment();
-        $id = $keywordCommonModel->addReturnId($param);
+        if(isset($this->param['id']) && !empty($this->param['id'])){
+            $id = $this->param['id'];
+            $keywordCommonModel->edit($this->param,['id'=>$this->param['id']]);
+        }else{
+            $param = [
+                'nickname' => $this->param['nickname'],
+                'text' => $this->param['text'],
+                'project_id' => $this->user['project_id'],
+                'type' => 1,
+                'uid' => 0,
+                'created_at' => date('Y-m-d H:i:s'),
+                'updated_at' => date('Y-m-d H:i:s')
+            ];
+            $id = $keywordCommonModel->addReturnId($param);
+        }
         return $this->success(['id'=>$id]);
     }