gx

@@ -5,6 +5,7 @@ namespace App\Console\Commands\DayCount;
 use App\Helper\Common;
 use App\Helper\Common;
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployBuild;
+use App\Models\Project\DeployOptimize;
 use Carbon\Carbon;
 use Carbon\Carbon;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -39,6 +40,11 @@ class Count extends Command
         $data = [];
         $data = [];
         $yesterday = Carbon::yesterday()->toDateString();
         $yesterday = Carbon::yesterday()->toDateString();
         foreach ($list as $v){
         foreach ($list as $v){
+            $optimizeModel = new DeployOptimize();
+            $optimizeInfo = $optimizeModel->read(['project_id'=>$v['project_id']]);
+            if($optimizeInfo !== false){
+                $v['test_domain'] = $optimizeInfo['domain'];
+            }
             $arr = [];
             $arr = [];
             //统计时间
             //统计时间
             $arr['date'] = $yesterday;
             $arr['date'] = $yesterday;
@@ -50,7 +56,7 @@ class Count extends Command
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             $arr['compliance_day'] = $this->compliance_day($yesterday);
             //剩余服务时常
             //剩余服务时常
             if($v['service_duration'] != 0){
             if($v['service_duration'] != 0){
-                $arr['service_day'] = ($v['service_duration'] - Common::getDaysToTargetDate($v['created_at']));
+                $arr['service_day'] = ($v['service_duration'] - Common::getDaysToTargetDate($optimizeInfo['cooperate_date']));
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
                 $arr['service_day'] = $arr['service_day'] > 0 ? $arr['service_day'] : 0;
             }else{
             }else{
                 $arr['service_day'] = 0;
                 $arr['service_day'] = 0;

@@ -63,8 +63,8 @@ class SyncProject extends Command
                 if($data['data']['order_type'] == '续费'){
                 if($data['data']['order_type'] == '续费'){
                     $data['data']['type'] = 4; //续费记录单
                     $data['data']['type'] = 4; //续费记录单
                 }
                 }
-                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data['data'], true) . PHP_EOL, FILE_APPEND);
-                return 1;
+//                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($data['data'], true) . PHP_EOL, FILE_APPEND);
+//                return 1;
                 ProjectLogic::instance()->sync($data['data']);
                 ProjectLogic::instance()->sync($data['data']);
                 $item->status = NoticeLog::STATUS_SUCCESS;
                 $item->status = NoticeLog::STATUS_SUCCESS;
                 $item->save();
                 $item->save();

@@ -288,7 +288,7 @@ class ProjectLogic extends BaseLogic
             'requirement' => $param['remark'],
             'requirement' => $param['remark'],
             'cooperate_date' => date('Y-m-d', $param['create_time']),
             'cooperate_date' => date('Y-m-d', $param['create_time']),
             'deploy_build' => [
             'deploy_build' => [
-                'service_duration' => $param['id'],
+                'service_duration' => $param['years'],
                 'plan' => $this->versionData($param['plan_marketing']),
                 'plan' => $this->versionData($param['plan_marketing']),
             ],
             ],
             'deploy_optimize' => [
             'deploy_optimize' => [