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

Lyh server



查看合并请求 !2445

@@ -1283,4 +1283,39 @@ class ProjectController extends BaseController
         NoticeLog::createLog(NoticeLog::TYPE_UPDATE_PROJECT_TDK, ['project_id' => $this->param['project_id'],'url'=>$this->param['url']]);
         NoticeLog::createLog(NoticeLog::TYPE_UPDATE_PROJECT_TDK, ['project_id' => $this->param['project_id'],'url'=>$this->param['url']]);
         $this->response('success',Code::SUCCESS,['url'=>$this->param['url']]);
         $this->response('success',Code::SUCCESS,['url'=>$this->param['url']]);
     }
     }
+
+    /**
+     * @remark :统计剩余服务时常
+     * @name   :serviceNumCount
+     * @author :lyh
+     * @method :post
+     * @time   :2025/7/29 14:12
+     */
+    public function serviceNumCount(){
+        $this->request->validate([
+            'end_date'=>'required',
+            'project_id'=>'required',
+            'renewal_record'=>'required',
+        ],[
+            'end_date.required' => '结束时常不能为空',
+            'project_id.required' => '项目id不能为空',
+            'renewal_record.required' => '续费记录不能为空',
+        ]);
+        if(isset($this->param['renewal_record']) && !empty($this->param['renewal_record'])){
+            $paymentModel = new Payment();
+            $renewal_record = Arr::a2s($this->param['renewal_record']);
+            $paymentModel->edit(['renewal_record'=>$renewal_record],['project_id'=>$this->param['project_id']]);
+        }
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['project_id'=>$this->param['project_id']],['uptime','project_type']);
+        $diff = (strtotime($this->param['end_time']) - strtotime($projectInfo['uptime'])) / (60 * 60 * 24);
+        $deployBuildModel = new DeployBuild();
+        if($projectModel['project_type'] == Project::PROJECT_TYPE_SEO){
+            $param = ['seo_service_duration'=>$diff];
+        }else{
+            $param = ['service_duration'=>$diff];
+        }
+        $deployBuildModel->edit($param,['project_id'=>$this->param['project_id']]);
+        $this->response('success');
+    }
 }
 }

@@ -114,7 +114,7 @@ class RenewProjectController extends BaseController
      * @time   :2023/8/18 14:33
      * @time   :2023/8/18 14:33
      */
      */
     public function notHaveRenewItems(Project $project){
     public function notHaveRenewItems(Project $project){
-        $this->map['extend_type'] = $project::TYPE_FIVE;//未续费网站        if(!empty($param['search']) && !empty($param['search_type'])){
+        $this->map['extend_type'] = $project::TYPE_FIVE;//未续费网站
         if(!empty($this->map['title'])){
         if(!empty($this->map['title'])){
             $this->map['title'] = ['like', '%'.$this->map['title'].'%'];
             $this->map['title'] = ['like', '%'.$this->map['title'].'%'];
         }
         }
@@ -131,7 +131,6 @@ class RenewProjectController extends BaseController
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
             $manageModel = new ManageHr();
             $manageModel = new ManageHr();
-
             foreach ($lists['list'] as $k=>$item){
             foreach ($lists['list'] as $k=>$item){
                 $item = $this->handleParam($item,$manageModel,$domainModel);
                 $item = $this->handleParam($item,$manageModel,$domainModel);
                 $lists['list'][$k] = $item;
                 $lists['list'][$k] = $item;

@@ -205,6 +205,7 @@ Route::middleware(['aloginauth'])->group(function () {
         Route::any('/setIsParticiple', [Aside\Project\ProjectController::class, 'setIsParticiple'])->name('admin.project_setIsParticiple');//开启/关闭分词
         Route::any('/setIsParticiple', [Aside\Project\ProjectController::class, 'setIsParticiple'])->name('admin.project_setIsParticiple');//开启/关闭分词
         Route::any('/saveSiteStatus', [Aside\Project\ProjectController::class, 'saveSiteStatus'])->name('admin.project_saveSiteStatus');
         Route::any('/saveSiteStatus', [Aside\Project\ProjectController::class, 'saveSiteStatus'])->name('admin.project_saveSiteStatus');
         Route::any('/updateTdk', [Aside\Project\ProjectController::class, 'updateTdk'])->name('admin.project_updateTdk');//更新项目tdk
         Route::any('/updateTdk', [Aside\Project\ProjectController::class, 'updateTdk'])->name('admin.project_updateTdk');//更新项目tdk
+        Route::any('/serviceNumCount', [Aside\Project\ProjectController::class, 'serviceNumCount'])->name('admin.project_serviceNumCount');//根据续费记录统计剩余服务时常
         //获取关键词前缀和后缀
         //获取关键词前缀和后缀
         Route::prefix('keyword')->group(function () {
         Route::prefix('keyword')->group(function () {
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');
             Route::any('/getKeywordPrefix', [Aside\Project\KeywordPrefixController::class, 'getKeywordPrefix'])->name('admin.keyword_getKeywordPrefix');