合并分支 'develop' 到 'master'

Develop



查看合并请求 !407

@@ -28,9 +28,9 @@ class NavController extends BaseController
      * @method :post
      * @method :post
      * @time   :2023/12/4 15:00
      * @time   :2023/12/4 15:00
      */
      */
-    public function index(BNav $nav,BNavGroup $navGroup){
+    public function index(BNav $nav){
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $nav->list($this->map,$this->order = ['sort','id']);
+        $lists = $nav->list($this->map,$this->order = ['sort','id'],['*'],'asc');
         $data = array();
         $data = array();
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
@@ -41,13 +41,6 @@ class NavController extends BaseController
                     $data[]   = $v;
                     $data[]   = $v;
                 }
                 }
             }
             }
-            //获取菜单组排序字段
-            $groupInfo = $navGroup->read(['id'=>$this->param['group_id']]);
-            if(!empty($groupInfo['sort_list'])){
-                $sort_list = json_decode($groupInfo['sort_list']);
-                $detailsList = $this->getIdDetailsList($data);
-                $data = $this->findDetailsLists($sort_list,$detailsList);
-            }
         }
         }
         $this->response('success',Code::SUCCESS,$data);
         $this->response('success',Code::SUCCESS,$data);
     }
     }
@@ -70,66 +63,6 @@ class NavController extends BaseController
     }
     }
 
 
     /**
     /**
-     * @remark :根据固定的数组排序
-     * @name   :findDetailsInList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/18 14:54
-     */
-    public function findDetailsLists($sort_list, $detailsList)
-    {
-        $result = [];
-        foreach ($sort_list as $val) {
-            $val = (array)$val;
-            if (!empty($val['sub']) && is_array($val['sub']) && isset($detailsList[$val['id']]['sub'])){
-                $detailsList[$val['id']]['sub'] = $this->findDetailsLists($val['sub'], $detailsList[$val['id']]['sub']);
-            }
-            if (empty($detailsList[$val['id']])){
-                continue;
-            }
-            if(!empty($detailsList[$val['id']]['sub']) && is_array($detailsList[$val['id']]['sub'])){
-                $detailsList[$val['id']]['sub'] = $this->handleDetailsSub($detailsList[$val['id']]['sub']);
-            }
-            $result[] = $detailsList[$val['id']];
-            unset($detailsList[$val['id']]);
-        }
-        $result = array_merge($result, $detailsList);
-        return $this->success($result);
-    }
-
-    /**
-     * @remark :处理子集
-     * @name   :handleDetailsSub
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/21 16:36
-     */
-    public function handleDetailsSub($detailsList){
-        if(!empty($detailsList['sub']) && is_array($detailsList['sub'])){
-            $detailsList['sub'] = $this->handleDetailsSub($detailsList['sub']);
-        }
-        return array_merge($detailsList);
-    }
-
-    /**
-     * @remark :根据id组装数据
-     * @name   :getDetailsList
-     * @author :lyh
-     * @method :post
-     * @time   :2023/12/20 18:52
-     */
-    public function getIdDetailsList($data){
-        $detailsList = [];
-        foreach ($data as $v) {
-            if (!empty($v['sub'])){
-                $v['sub'] = $this->getIdDetailsList($v['sub']);
-            }
-            $detailsList[$v['id']] = $v;
-        }
-        return $this->success($detailsList);
-    }
-
-    /**
      * @remark :获取当前id下的所有子集
      * @remark :获取当前id下的所有子集
      * @name   :getSubList
      * @name   :getSubList
      * @author :lyh
      * @author :lyh
@@ -233,10 +166,8 @@ class NavController extends BaseController
      */
      */
     public function setSortList(NavLogic $navLogic){
     public function setSortList(NavLogic $navLogic){
         $this->request->validate([
         $this->request->validate([
-            'id'=>'required',
             'sort_list'=>'required',
             'sort_list'=>'required',
         ],[
         ],[
-            'id.required' => 'ID不能为空',
             'sort_list.required' => '排序不能为空',
             'sort_list.required' => '排序不能为空',
         ]);
         ]);
         $navLogic->setSortList();
         $navLogic->setSortList();

@@ -260,11 +260,30 @@ class NavLogic extends  BaseLogic
      * @time   :2023/12/18 13:47
      * @time   :2023/12/18 13:47
      */
      */
     public function setSortList(){
     public function setSortList(){
-        $navGroupModel = new BNavGroup();
-        if(!empty($this->param['sort_list'])){
-            $this->param['sort_list'] = json_encode($this->param['sort_list']);
+        $navList = $this->param['sort_list'];
+        if(!empty($navList)){
+            $sort = 0;
+            $this->subSort($navList,$sort);
         }
         }
-        $navGroupModel->edit(['sort_list'=>$this->param['sort_list']],['id'=>$this->param['id']]);
         return $this->success();
         return $this->success();
     }
     }
+
+    /**
+     * @remark :处理子集排序
+     * @name   :subSort
+     * @author :lyh
+     * @method :post
+     * @time   :2024/2/29 15:30
+     */
+    public function subSort($subList,&$sort,$pid = 0){
+        $navModel = new BNav();
+        foreach ($subList as $k => $v){
+            $sort = $sort+1;
+            $navModel->edit(['pid'=>$pid,'sort'=>$sort],['id'=>$v['id']]);
+            if(!empty($v['sub'])){
+                $this->subSort($v['sub'],$sort,$v['id']);
+            }
+        }
+        return true;
+    }
 }
 }

@@ -45,7 +45,7 @@ class ProductLogic extends  BaseLogic
         $category_ids = $this->handleCategory();
         $category_ids = $this->handleCategory();
         //处理其他字段
         //处理其他字段
         $this->param = $this->handleSaveParam($this->param);
         $this->param = $this->handleSaveParam($this->param);
-        try {
+//        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $is_upgrade = $this->param['is_upgrade'] ?? 0;//1:5.0数据 0：6.0
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
                 $six_read = $this->param['six_read'] ?? 0;//是否按6.0显示
@@ -66,10 +66,10 @@ class ProductLogic extends  BaseLogic
             CategoryRelated::saveRelated($id, $category_ids);
             CategoryRelated::saveRelated($id, $category_ids);
             //保存扩展字段
             //保存扩展字段
             $this->saveExtendInfo($id,$extend);
             $this->saveExtendInfo($id,$extend);
-        }catch (\Exception $e){
-            Log::info('错误信息---'.$e->getMessage());
-            $this->fail('系统错误请联系管理员');
-        }
+//        }catch (\Exception $e){
+//            Log::info('错误信息---'.$e->getMessage());
+//            $this->fail('系统错误请联系管理员');
+//        }
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->addUpdateNotify(RouteMap::SOURCE_PRODUCT,$route);
         $this->curlDelRoute(['new_route'=>$route]);
         $this->curlDelRoute(['new_route'=>$route]);
         return $this->success();
         return $this->success();

@@ -67,7 +67,7 @@ class ProductRequest extends FormRequest
     {
     {
         return [
         return [
             'title.required' => '请输入产品标题',
             'title.required' => '请输入产品标题',
-            'title.max' => '产品标题不能超过20个字符',
+            'title.max' => '产品标题不能超过200个字符',
             'route.required' => '请输入产品链接',
             'route.required' => '请输入产品链接',
             'route.max' => '产品链接不能超过200个字符',
             'route.max' => '产品链接不能超过200个字符',
 //            'gallery.required' => '请上传产品图片',
 //            'gallery.required' => '请上传产品图片',