Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6

赵彬吉
app/Http/Controllers/Bside/AyrShare/AyrReleaseController.php
app/Http/Controllers/Bside/CustomModule/CustomModuleCategoryController.php
app/Http/Controllers/Bside/CustomModule/CustomModuleContentController.php
app/Http/Logic/Bside/AyrShare/AyrReleaseLogic.php
app/Http/Logic/Bside/Product/CategoryLogic.php
--- a/app/Http/Controllers/Bside/AyrShare/AyrReleaseController.php
查看文件 @256be85
+++ b/app/Http/Controllers/Bside/AyrShare/AyrReleaseController.php
查看文件 @256be85
@@ -70,19 +70,22 @@ class AyrReleaseController extends BaseController
         //参数处理
         $this->param['mediaUrls'] = $ayrReleaseLogic->image_file_param($data);
         //时间处理
-        $datetime = new \DateTime($this->param['schedule_date'] ?? date('Y-m-d H:i:s'));
-        $formattedTime = $datetime->format("Y-m-d\TH:i:s\Z");
         //统一生成发布
         $param = [
             'post'=>$this->param['content'],
             'platforms'=>$this->param['platforms'],
             'mediaUrls'=>$this->param['mediaUrls'],//参数处理
-            'scheduleDate'=>$formattedTime,//时间（如是过去时间，立即发布）
         ];
+        if(isset($this->param['schedule_date']) && !empty($this->param['schedule_date'])){
+            $datetime = new \DateTime($this->param['schedule_date'] ?? date('Y-m-d H:i:s'));
+            $formattedTime = $datetime->format("Y-m-d\TH:i:s\Z");
+            $param['scheduleDate'] = $formattedTime;//时间（如是过去时间，立即发布）
+        }
         //发送请求发布社交文章
         $res = $ayrShare->post_send_msg($param,$share_info['profile_key']);
         //保存数据库
-        $ayrReleaseLogic->release_add();
+        $ayrReleaseLogic->release_add($res);
+        //保存返回的内容
         $this->response('success',Code::SUCCESS,json_decode($res));
     }
--- a/app/Http/Controllers/Bside/CustomModule/CustomModuleCategoryController.php
查看文件 @256be85
+++ b/app/Http/Controllers/Bside/CustomModule/CustomModuleCategoryController.php
查看文件 @256be85
@@ -12,7 +12,10 @@ namespace App\Http\Controllers\Bside\CustomModule;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleCategoryLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Models\User\User;
 class CustomModuleCategoryController extends BaseController
@@ -34,7 +37,9 @@ class CustomModuleCategoryController extends BaseController
         $this->map['status'] = 0;
         $list = $customModuleCategory->list($this->map,'sort');
         if(!empty($list)){
+            $template_id = $this->getModuleTemplateId($this->param['module_id']);
             foreach ($list as $k => $v){
+                $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_LIST,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $v['url'] = $this->user['domain'].$v['route'];
                 $list[$k] = $v;
             }
@@ -44,6 +49,25 @@ class CustomModuleCategoryController extends BaseController
     }
     /**
+     * @remark :扩展模块获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 16:47
+     */
+    public function getModuleTemplateId($module_id){
+        $template_id = 0;
+        $moduleModel = new CustomModule();
+        $info = $moduleModel->read(['id'=>$module_id]);
+        if($info['list_customized'] != 1){
+            $bSettingModel = new Setting();
+            $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+            $template_id = $info['template_id'];
+        }
+        return $this->success($template_id);
+    }
+
+    /**
      * @remark :无分页子集处理
      * @name   :getListSon
      * @author :lyh
--- a/app/Http/Controllers/Bside/CustomModule/CustomModuleContentController.php
查看文件 @256be85
+++ b/app/Http/Controllers/Bside/CustomModule/CustomModuleContentController.php
查看文件 @256be85
@@ -12,9 +12,12 @@ namespace App\Http\Controllers\Bside\CustomModule;
 use App\Enums\Common\Code;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Bside\CustomModule\CustomModuleContentLogic;
+use App\Models\CustomModule\CustomModule;
 use App\Models\CustomModule\CustomModuleCategory;
 use App\Models\CustomModule\CustomModuleContent;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Setting;
 use App\Models\User\User;
 class CustomModuleContentController extends BaseController
@@ -35,12 +38,14 @@ class CustomModuleContentController extends BaseController
         $this->map['project_id'] = $this->user['project_id'];
         $lists = $customModuleContent->lists($this->map,$this->page,$this->row,$this->order = ['sort','id']);
         if(!empty($lists)){
+            $template_id = $this->getModuleTemplateId($this->param['module_id']);
             $data = $this->getAllCategoryName();
             foreach ($lists['list'] as $k=>$v){
                 $v['url'] = $this->getUrl($v);
                 $v = $this->getHandleImageFile($v);
                 $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['operator_name'] = (new User())->getName($v['operator_id']);
+                $v['is_renovation']  =  $this->getIsRenovation($v['module_id'],BTemplate::IS_DETAIL,$template_id,$v['id'],BTemplate::IS_CUSTOM);
                 $lists['list'][$k] = $v;
             }
         }
@@ -48,6 +53,25 @@ class CustomModuleContentController extends BaseController
     }
     /**
+     * @remark :扩展模块获取模版id
+     * @name   :getTemplateId
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/31 16:47
+     */
+    public function getModuleTemplateId($module_id){
+        $template_id = 0;
+        $moduleModel = new CustomModule();
+        $info = $moduleModel->read(['id'=>$module_id]);
+        if($info['detail_customized'] != 1){
+            $bSettingModel = new Setting();
+            $info = $bSettingModel->read(['project_id'=>$this->user['project_id']]);
+            $template_id = $info['template_id'];
+        }
+        return $this->success($template_id);
+    }
+
+    /**
      * @remark :获取时处理视频，图片，文件
      * @name   :getHandleImageFile
      * @author :lyh
--- a/app/Http/Logic/Bside/AyrShare/AyrReleaseLogic.php
查看文件 @256be85
+++ b/app/Http/Logic/Bside/AyrShare/AyrReleaseLogic.php
查看文件 @256be85
@@ -37,12 +37,13 @@ class AyrReleaseLogic extends BaseLogic
      * @method :post
      * @time   :2023/5/9 9:38
      */
-    public function release_add(){
+    public function release_add($res){
         $this->param['project_id'] = $this->user['project_id'];
         $this->param['operator_id'] = $this->user['id'];
         if(isset($this->param['images']) && !empty($this->param['images'])){
             $this->param['images'] = implode(',',$this->param['images']);
         }
+        $this->param['result_data'] = $res;
         $this->param['platforms'] = json_encode($this->param['platforms']);
         $rs = $this->model->add($this->param);
         if($rs === false){
--- a/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @256be85
+++ b/app/Http/Logic/Bside/Product/CategoryLogic.php
查看文件 @256be85
@@ -196,7 +196,9 @@ class CategoryLogic extends  BaseLogic
         RouteMap::delRoute(RouteMap::SOURCE_PRODUCT_CATE, $id, $this->user['project_id']);
         //生成一条删除路由记录
         $info = $this->model->read(['id'=>$id],['id','route']);
-        $this->curlDelRoute(['route'=>$info['route']]);
+        if($info !== false){
+            $this->curlDelRoute(['route'=>$info['route']]);
+        }
         return $this->success();
     }