Merge remote-tracking branch 'origin/master' into akun

@@ -6,6 +6,7 @@ use App\Enums\Common\Code;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Template\ATemplateLogic;
 use App\Http\Requests\Aside\Template\ATemplateRequest;
+use App\Models\Template\Setting;
 
 /**
  * @remark :A端主题模板管理
@@ -35,6 +36,23 @@ class ATemplateController extends BaseController
     }
 
     /**
+     * @remark :获取选择的模版
+     * @name   :getTemplateInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/3 17:19
+     */
+    public function getSettingInfo(ATemplateLogic $aTemplateLogic){
+        $this->request->validate([
+            'project_id'=>'required'
+        ],[
+            'project_id.required' => 'project_id不能为空'
+        ]);
+        $info = $aTemplateLogic->getSettingInfo();
+        $this->response('success',Code::SUCCESS,$info);
+    }
+
+    /**
      * @remark :获取数据详情
      * @name   :read
      * @author :lyh

@@ -185,4 +185,21 @@ class ATemplateLogic extends BaseLogic
         }
         return $this->success();
     }
+
+    /**
+     * @remark :获取选择的模版
+     * @name   :getSettingInfo
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/3 17:21
+     */
+    public function getSettingInfo(){
+        $data = [];
+        $bSettingModel = new Setting();
+        $info = $bSettingModel->read(['project_id'=>$this->param['project_id']],['template_id']);
+        if($info !== false){
+            $data = $this->model->read(['id'=>$info['template_id']],['id','name']);
+        }
+        return $this->success($data);
+    }
 }

@@ -354,7 +354,25 @@ class BlogCategoryLogic extends BaseLogic
             }
             $return[] = $c_id;
         }
-        return ','.implode(',',$return).',';
+        return $this->getLastCategory($return);
+    }
+
+    /**
+     * @remark :获取最后一级分类id
+     * @name   :getLastCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/20 9:02
+     */
+    public function getLastCategory($category){
+        $str = '';
+        foreach ($category as $v){
+            $info = $this->model->read(['pid'=>$v]);
+            if($info === false){
+                $str .= $v.',';
+            }
+        }
+        return ','.$str;
     }
 
     /**

@@ -336,7 +336,25 @@ class NewsCategoryLogic extends BaseLogic
             }
             $return[] = $c_id;
         }
-        return ','.implode(',',$return).',';
+        return $this->getLastCategory($return);
+    }
+
+    /**
+     * @remark :获取最后一级分类id
+     * @name   :getLastCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/20 9:02
+     */
+    public function getLastCategory($category){
+        $str = '';
+        foreach ($category as $v){
+            $info = $this->model->read(['pid'=>$v]);
+            if($info === false){
+                $str .= $v.',';
+            }
+        }
+        return ','.$str;
     }
 
     /**

@@ -59,8 +59,8 @@ class NewsLogic extends BaseLogic
     public function newsSave()
     {
         //拼接参数
-//        DB::beginTransaction();
-//        try {
+        DB::beginTransaction();
+        try {
             $this->param = $this->paramProcessing($this->param);
             if (isset($this->param['id']) && !empty($this->param['id'])) {
                 //是否更新路由
@@ -72,11 +72,11 @@ class NewsLogic extends BaseLogic
             //更新路由
             $route = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_NEWS, $id, $this->user['project_id']);
             $this->edit(['url' => $route], ['id' => $id]);
-//            DB::commit();
-//        } catch (\Exception $e) {
-//            DB::rollBack();
-//            $this->fail('系统错误，请联系管理员');
-//        }
+            DB::commit();
+        } catch (\Exception $e) {
+            DB::rollBack();
+            $this->fail('系统错误，请联系管理员');
+        }
         //通知更新
         $this->updateNotify(['project_id' => $this->user['project_id'], 'type' => RouteMap::SOURCE_NEWS, 'route' => $route]);
         return $this->success();

@@ -319,10 +319,29 @@ class CategoryLogic extends  BaseLogic
             }
             $return[] = $c_id;
         }
-
         //清除缓存
         Common::del_user_cache('product_category',$project_id);
-        return ','.implode(',',$return).',';
+        return $this->getLastCategory($return);
+    }
+
+    /**
+     * @remark :获取最后一级分类id
+     * @name   :getLastCategory
+     * @author :lyh
+     * @method :post
+     * @time   :2023/10/20 9:02
+     */
+    public function getLastCategory($category){
+        $str = '';
+        if(isset($category) && !empty($category)){
+            foreach ($category as $v){
+                $info = $this->model->read(['pid'=>$v]);
+                if($info === false){
+                    $str .= $v.',';
+                }
+            }
+        }
+        return ','.$str;
     }
 
     /**

@@ -293,6 +293,7 @@ Route::middleware(['aloginauth'])->group(function () {
     Route::prefix('template')->group(function () {
         Route::any('/', [Aside\Template\ATemplateController::class, 'lists'])->name('admin.ATemplate_lists');
         Route::any('/read', [Aside\Template\ATemplateController::class, 'read'])->name('admin.ATemplate_read');
+        Route::any('/getSettingInfo', [Aside\Template\ATemplateController::class, 'getSettingInfo'])->name('admin.ATemplate_getSettingInfo');
         Route::any('/save', [Aside\Template\ATemplateController::class, 'save'])->name('admin.ATemplate_save');
         Route::any('/status', [Aside\Template\ATemplateController::class, 'status'])->name('admin.ATemplate_status');
         Route::any('/del', [Aside\Template\ATemplateController::class, 'del'])->name('admin.ATemplate_del');