Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/config/validate_rules.php

@@ -2,6 +2,7 @@
 
 use app\model\AdminMenuModel;
 use app\model\CommonModel;
+use app\model\GroupModel;
 use app\model\RoleModel;
 
 return [
@@ -132,33 +133,23 @@ return [
         'new_password|新密码' => 'require|min:6|max:255',
     ],
 
-    //【视频分组】
+    //【企业和卡类型批量设置】
     //添加
-    'VideoGroupAdd' => [
-        'company_id|企业id' => 'require|number|gt:0',
-        'card_id|卡类型id' => 'require|number|gt:0',
-    ],
-    //【视频分组明细】
-    //添加
-    'VideoGroupItemAdd' => [
-        'video_group_id|视频分组id' => 'require|number|gt:0',
-        'video_id|视频id' => 'require|number|gt:0',
-    ],
-    //【商品分组】
-    //添加
-    'GoodGroupAdd' => [
+    'GroupAdd' => [
         'company_id|企业id' => 'require|number|gt:0',
         'card_id|卡类型id' => 'require|number|gt:0',
         'remark|备注' => 'max:255',
     ],
-    //【商品分组明细】
+    //【企业和卡类型批量设置明细】
     //添加
-    'GoodGroupItemAdd' => [
-        'good_group_id|商品分组id' => 'require|number|gt:0',
-        'good_id|商品id' => 'require|number|gt:0',
-        'weight|权重' => 'require|number|egt:0',
+    'GroupItemAdd' => [
+        'group_id|分组id' => 'require|number|gt:0',
+        'item_id|明细id' => 'require|number|gt:0',
+        'type|明细类型'=>'require|number|in:'.GroupModel::$type_good.','.GroupModel::$type_video,
+        'weight|权重' => 'number|egt:0',
     ],
 
+
     //【商城商品库存】
     //添加
     'InventoryShoppingAdd' => [

app/admin/controller/GoodGroupItem.php

@@ -1,65 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\admin\logic\GoodGroupItemLogic;
-use app\BaseController;
-use app\model\CommonModel;
-use think\exception\ValidateException;
-use think\facade\Config;
-use think\facade\Validate;
-
-//【商品分组明细】
-class GoodGroupItem extends BaseController
-{
-    //获取商品分组明细列表
-    public function list()
-    {
-        $param = $this->request->only(['good_group_id' => 0, 'page' => 1, 'size' => 10, 'good_title' => ''], 'post');
-
-        return GoodGroupItemLogic::list($param);
-    }
-
-    //添加商品分组明细
-    public function add()
-    {
-        $param = $this->request->only(['good_group_id', 'good_id','weight'=>0], 'post');
-
-        $val = Validate::rule(Config::get('validate_rules.GoodGroupItemAdd'));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return GoodGroupItemLogic::add($param);
-    }
-
-    //获取商品分组明细详情
-    public function read()
-    {
-        $id = $this->request->post('id/d', 0);
-        return GoodGroupItemLogic::read($id);
-    }
-
-    //编辑商品分组明细
-    public function edit()
-    {
-        $param = $this->request->only(['id', 'good_id','weight'], 'post');
-
-        $val = Validate::rule([
-            'id|商品分组明细id' => 'require|number|gt:0',
-            'good_id|商品id' => 'require|number|gt:0',
-            'weight|权重' => 'number|egt:0',
-        ]);
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return GoodGroupItemLogic::edit($param);
-    }
-
-    //删除商品分组明细
-    public function delete()
-    {
-        $ids = $this->request->post('id/a', []);
-        return GoodGroupItemLogic::delete($ids);
-    }
-
-}

app/admin/controller/GoodGroup.php → app/admin/controller/Group.php

@@ -2,56 +2,56 @@
 
 namespace app\admin\controller;
 
-use app\admin\logic\GoodGroupLogic;
+use app\admin\logic\GroupLogic;
 use app\BaseController;
 use app\model\CommonModel;
 use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Validate;
 
-//【商品分组】
-class GoodGroup extends BaseController
+//【企业和卡类型批量设置表】
+class Group extends BaseController
 {
-    //获取商品分组列表
+    //列表
     public function list()
     {
         $param = $this->request->only(['page' => 1, 'size' => 10, 'status' => '', 'company_title' => '', 'card_title' => ''], 'post');
 
-        return GoodGroupLogic::list($param);
+        return GroupLogic::list($param);
     }
 
-    //添加商品分组
+    //添加
     public function add()
     {
         $param = $this->request->only(['company_id', 'card_id', 'remark' => ''], 'post');
 
-        $val = Validate::rule(Config::get('validate_rules.GoodGroupAdd'));
+        $val = Validate::rule(Config::get('validate_rules.GroupAdd'));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return GoodGroupLogic::add($param);
+        return GroupLogic::add($param);
     }
 
-    //获取商品分组详情
+    //详情
     public function read()
     {
         $id = $this->request->post('id/d', 0);
-        return GoodGroupLogic::read($id);
+        return GroupLogic::read($id);
     }
 
-    //编辑商品分组
+    //编辑
     public function edit()
     {
         $param = $this->request->only(['id', 'company_id', 'card_id', 'remark' => ''], 'post');
 
-        $val = Validate::rule(array_merge(Config::get('validate_rules.GoodGroupAdd'), ['id|商品分组id' => 'require|number|gt:0']));
+        $val = Validate::rule(array_merge(Config::get('validate_rules.GroupAdd'), ['id|分组id' => 'require|number|gt:0']));
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return GoodGroupLogic::edit($param);
+        return GroupLogic::edit($param);
     }
 
-    //商品分组启禁用
+    //启禁用
     public function status()
     {
         $param = $this->request->only(['id', 'status'], 'post');
@@ -60,14 +60,14 @@ class GoodGroup extends BaseController
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
-        return GoodGroupLogic::status($param);
+        return GroupLogic::status($param);
     }
 
-    //删除商品分组
+    //删除
     public function delete()
     {
         $ids = $this->request->post('id/a', []);
-        return GoodGroupLogic::delete($ids);
+        return GroupLogic::delete($ids);
     }
 
 

app/admin/controller/GroupItem.php

@@ -0,0 +1,90 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\logic\GroupItemLogic;
+use app\BaseController;
+use app\model\CommonModel;
+use app\model\GroupModel;
+use think\exception\ValidateException;
+use think\facade\Config;
+use think\facade\Validate;
+
+//【分组明细】
+class GroupItem extends BaseController
+{
+    //获取分组明细列表
+    public function list()
+    {
+        $param = $this->request->only(['group_id' => 0, 'type' => GroupModel::$type_good, 'page' => 1, 'size' => 10, 'title' => ''], 'post');
+
+        $val = Validate::rule([
+            'group_id|分组id' => 'require|number|gt:0',
+            'type|明细类型' => 'require|number|in:' . GroupModel::$type_good . ',' . GroupModel::$type_video,
+            'page|页码' => 'require|number|gt:0',
+            'size|每页数量' => 'require|number|elt:100',
+        ]);
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return GroupItemLogic::list($param);
+    }
+
+    //添加分组明细
+    public function add()
+    {
+        $param = $this->request->only(['group_id', 'type', 'item_id', 'weight' => 0], 'post');
+
+        $val = Validate::rule(Config::get('validate_rules.GroupItemAdd'));
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return GroupItemLogic::add($param);
+    }
+
+    //获取分组明细详情
+    public function read()
+    {
+        $id = $this->request->post('id/d', 0);
+        return GroupItemLogic::read($id);
+    }
+
+    //编辑分组明细
+    public function edit()
+    {
+        $param = $this->request->only(['id', 'item_id', 'weight' => 0], 'post');
+
+        $val = Validate::rule([
+            'id|分组明细id' => 'require|number|gt:0',
+            'item_id|明细id' => 'require|number|gt:0',
+            'weight|权重' => 'number|egt:0',
+        ]);
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return GroupItemLogic::edit($param);
+    }
+
+    //删除分组明细
+    public function delete()
+    {
+        $ids = $this->request->post('id/a', []);
+        return GroupItemLogic::delete($ids);
+    }
+
+    //删除分组明细
+    public function top()
+    {
+        $param = $this->request->only(['id', 'is_top'], 'post');
+
+        $val = Validate::rule([
+            'id' => 'require|number|gt:0',
+            'is_top|是否置顶' => 'require|number|in:' . CommonModel::$top_no . ',' . CommonModel::$top_yes,
+        ]);
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return GroupItemLogic::top($param);
+    }
+
+}

app/admin/controller/OrderExchange.php

@@ -26,7 +26,7 @@ class OrderExchange extends BaseController
 
     //发货
     public function out(){
-        
+
     }
 
 }

app/admin/controller/VideoGroup.php

@@ -1,88 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\admin\logic\VideoGroupLogic;
-use app\BaseController;
-use app\model\CommonModel;
-use think\exception\ValidateException;
-use think\facade\Config;
-use think\facade\Validate;
-
-//【视频分组】
-class VideoGroup extends BaseController
-{
-    //获取视频分组列表
-    public function list()
-    {
-        $param = $this->request->only(['page' => 1, 'size' => 10, 'status' => '', 'company_title' => '', 'card_title' => ''], 'post');
-
-        return VideoGroupLogic::list($param);
-    }
-
-    //添加视频分组
-    public function add()
-    {
-        $param = $this->request->only(['company_id', 'card_id', 'remark' => ''], 'post');
-
-        $val = Validate::rule(Config::get('validate_rules.VideoGroupAdd'));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupLogic::add($param);
-    }
-
-    //获取视频分组详情
-    public function read()
-    {
-        $id = $this->request->post('id/d', 0);
-        return VideoGroupLogic::read($id);
-    }
-
-    //编辑视频分组
-    public function edit()
-    {
-        $param = $this->request->only(['id', 'company_id', 'card_id','remark' => ''], 'post');
-
-        $val = Validate::rule(array_merge(Config::get('validate_rules.VideoGroupAdd'), ['id|视频分组id' => 'require|number|gt:0']));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupLogic::edit($param);
-    }
-
-    //视频分组启禁用
-    public function status()
-    {
-        $param = $this->request->only(['id','status'],'post');
-
-        $val = Validate::rule(Config::get('validate_rules.status'));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupLogic::status($param);
-    }
-
-    //删除视频分组
-    public function delete()
-    {
-        $ids = $this->request->post('id/a', []);
-        return VideoGroupLogic::delete($ids);
-    }
-
-    //视频分组置顶
-    public function top()
-    {
-        $param = $this->request->only(['id','is_top'],'post');
-
-        $val = Validate::rule([
-            'id' => 'require|number|gt:0',
-            'is_top|是否置顶' => 'require|number|in:' . CommonModel::$top_no . ',' . CommonModel::$top_yes,
-        ]);
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupLogic::top($param);
-    }
-
-}

app/admin/controller/VideoGroupItem.php

@@ -1,79 +0,0 @@
-<?php
-
-namespace app\admin\controller;
-
-use app\admin\logic\VideoGroupItemLogic;
-use app\BaseController;
-use app\model\CommonModel;
-use think\exception\ValidateException;
-use think\facade\Config;
-use think\facade\Validate;
-
-//【视频分组明细】
-class VideoGroupItem extends BaseController
-{
-    //获取视频分组明细列表
-    public function list()
-    {
-        $param = $this->request->only(['video_group_id' => 0, 'page' => 1, 'size' => 10, 'video_title' => ''], 'post');
-
-        return VideoGroupItemLogic::list($param);
-    }
-
-    //添加视频分组明细
-    public function add()
-    {
-        $param = $this->request->only(['video_group_id', 'video_id'], 'post');
-
-        $val = Validate::rule(Config::get('validate_rules.VideoGroupItemAdd'));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupItemLogic::add($param);
-    }
-
-    //获取视频分组明细详情
-    public function read()
-    {
-        $id = $this->request->post('id/d', 0);
-        return VideoGroupItemLogic::read($id);
-    }
-
-    //编辑视频分组明细
-    public function edit()
-    {
-        $param = $this->request->only(['id', 'video_id'], 'post');
-
-        $val = Validate::rule([
-            'id|视频分组明细id' => 'require|number|gt:0',
-            'video_id|视频id' => 'require|number|gt:0',
-        ]);
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupItemLogic::edit($param);
-    }
-
-    //删除视频分组明细
-    public function delete()
-    {
-        $ids = $this->request->post('id/a', []);
-        return VideoGroupItemLogic::delete($ids);
-    }
-
-    //视频分组明细置顶
-    public function top()
-    {
-        $param = $this->request->only(['id', 'is_top'], 'post');
-
-        $val = Validate::rule([
-            'id' => 'require|number|gt:0',
-            'is_top|是否置顶' => 'require|number|in:' . CommonModel::$top_no . ',' . CommonModel::$top_yes,
-        ]);
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
-
-        return VideoGroupItemLogic::top($param);
-    }
-
-}

app/admin/logic/GoodGroupItemLogic.php

@@ -1,161 +0,0 @@
-<?php
-
-namespace app\admin\logic;
-
-use app\model\CommonModel;
-use app\model\GoodGroupModel;
-use app\model\GoodModel;
-use think\Exception;
-use think\exception\ValidateException;
-use think\facade\Db;
-use think\response\Json;
-
-class GoodGroupItemLogic extends BaseLogic
-{
-
-    //列表
-    public static function list(array $data = []): Json
-    {
-        $db = Db::name('good_group_item')
-            ->alias('a')
-            ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
-            ->where(['a.is_del' => CommonModel::$del_normal, 'good_group_id' => $data['good_group_id']]);
-
-        if ($data['good_title'] != '') $db->whereLike('b.good_name', '%' . $data['good_title'] . '%');
-
-        $count = $db->count('a.id');
-
-        $list = $db->field('a.id,b.good_code,b.good_name,a.weight')
-            ->page($data['page'], $data['size'])
-            ->order(['a.weight' => 'desc', 'a.id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        return json_show(CommonModel::$success, '获取商品分组明细列表成功', ['count' => $count, 'list' => $list]);
-    }
-
-    //添加
-    public static function add(array $data = []): Json
-    {
-
-        Db::startTrans();
-
-        try {
-
-            $rs = GoodGroupModel::field('id')
-                ->where(['id' => $data['good_group_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty()
-                ->isEmpty();
-            if ($rs) throw new Exception('该商品分组不存在');
-
-            $rs = GoodModel::field('id')
-                ->where(['id' => $data['good_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty()
-                ->isEmpty();
-            if ($rs) throw new Exception('该商品不存在');
-
-            $rs = Db::name('good_group_item')
-                ->field('id')
-                ->where([
-                    'is_del' => CommonModel::$del_normal,
-                    'good_group_id' => $data['good_group_id'],
-                    'good_id' => $data['good_id']])
-                ->findOrEmpty();
-            if (!empty($rs)) throw new Exception('该商品已存在，不能在同一商品分组下重复添加');
-
-            $res = Db::name('good_group_item')
-                ->insert(array_merge($data, [
-                    'is_del' => CommonModel::$del_normal,
-                    'addtime' => date('Y-m-d H:i:s'),
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ]));
-
-            Db::name('good_group')
-                ->where(['id' => $data['good_group_id'], 'is_del' => CommonModel::$del_normal])
-                ->inc('num', $res)
-                ->update(['updatetime' => date('Y-m-d H:i:s')]);
-
-            Db::commit();
-
-            return $res ? json_show(CommonModel::$success, '添加商品分组明细成功') : json_show(CommonModel::$success, '添加商品分组明细失败');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '添加商品分组明细失败,' . $exception->getMessage());
-        }
-    }
-
-    //获取详情
-    public static function read(int $id = 0): Json
-    {
-        $res = Db::name('good_group_item')
-            ->field(true)
-            ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty();
-
-        if (empty($res)) throw new ValidateException('该商品分组明细为空');
-
-        return json_show(CommonModel::$success, '获取商品分组明细详情成功', $res);
-    }
-
-    //编辑
-    public static function edit(array $data = []): Json
-    {
-        $rs = GoodModel::field('id')
-            ->where(['id' => $data['good_id'], 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty()
-            ->isEmpty();
-        if ($rs) return json_show(CommonModel::$error_param, '该商品不存在');
-
-        $res = Db::name('good_group_item')
-            ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s')]));
-
-        return $res ? json_show(CommonModel::$success, '编辑商品分组明细成功') : json_show(CommonModel::$error_param, '编辑商品分组明细失败');
-
-    }
-
-    //删除
-    public static function delete(array $ids = []): Json
-    {
-        Db::startTrans();
-
-        try {
-
-            $good_group_id = Db::name('good_group_item')
-                ->whereIn('id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->group('good_group_id')
-                ->column('good_group_id');
-
-            if (count($good_group_id) > 1) throw new Exception('不能删除不同分组下的商品');
-
-            $num = Db::name('good_group_item')
-                ->whereIn('id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->update([
-                    'is_del' => CommonModel::$del_deleted,
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ]);
-
-            Db::name('good_group')
-                ->where(['id' => $good_group_id[0], 'is_del' => CommonModel::$del_normal])
-                ->dec('num', $num)
-                ->update([
-                    'updatetime' => date('Y-m-d H:i:s'),
-                    'updaterid' => self::$uid,
-                    'updater' => self::$uname
-                ]);
-
-            Db::commit();
-
-            return $num ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败,该商品分组明细不存在');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '删除商品分组明细失败,' . $exception->getMessage());
-        }
-    }
-
-
-}

app/admin/logic/GoodGroupLogic.php

@@ -1,165 +0,0 @@
-<?php
-
-namespace app\admin\logic;
-
-use app\model\CommonModel;
-use app\model\GoodGroupModel;
-use think\Exception;
-use think\exception\ValidateException;
-use think\facade\Db;
-use think\response\Json;
-
-class GoodGroupLogic extends BaseLogic
-{
-
-    //获取商品分组列表
-    public static function list(array $data = []): Json
-    {
-        $db = GoodGroupModel::alias('a')
-            ->leftJoin('company b', 'b.id=a.company_id AND b.is_del=' . CommonModel::$del_normal)
-            ->leftJoin('card c', 'c.id=a.card_id AND c.is_del=' . CommonModel::$del_normal)
-            ->where('a.is_del', CommonModel::$del_normal);
-
-        if ($data['status'] != '') $db->where('a.status', $data['status']);
-        if ($data['company_title'] != '') $db->whereLike('b.title', '%' . $data['company_title'] . '%');
-        if ($data['card_title'] != '') $db->whereLike('c.title', '%' . $data['card_title'] . '%');
-
-        $count = $db->count('a.id');
-
-        $list = $db->field('a.id,b.title company_title,c.title card_title,a.num,a.status,a.addtime')
-            ->page($data['page'], $data['size'])
-            ->order(['a.id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        return json_show(CommonModel::$success, '获取商品分组列表成功', ['count' => $count, 'list' => $list]);
-    }
-
-    //添加商品分组
-    public static function add(array $data = []): Json
-    {
-        $rs = GoodGroupModel::field('id')
-            ->where([
-                'is_del' => CommonModel::$del_normal,
-                'company_id' => $data['company_id'],
-                'card_id' => $data['card_id']
-            ])
-            ->findOrEmpty()
-            ->isEmpty();
-        if (!$rs) return json_show(CommonModel::$error_param, '该商品分组已存在');
-
-        $date = date('Y-m-d H:i:s');
-
-        $res = GoodGroupModel::create(array_merge($data, [
-            'num' => 0,
-            'status' => CommonModel::$status_normal,
-            'is_del' => CommonModel::$del_normal,
-            'createrid' => self::$uid,
-            'creater' => self::$uname,
-            'addtime' => $date,
-            'updaterid' => self::$uid,
-            'updater' => self::$uname,
-            'updatetime' => $date,
-        ]))->save();
-
-        return $res ? json_show(CommonModel::$success, '添加商品分组成功') : json_show(CommonModel::$error_param, '添加商品分组失败');
-
-    }
-
-    //获取商品分组详情
-    public static function read(int $id = 0): Json
-    {
-        $res = GoodGroupModel::field(true)
-            ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty()
-            ->toArray();
-
-        return empty($res) ? json_show(CommonModel::$error_param, '该商品分组为空') : json_show(CommonModel::$success, '获取商品分组详情成功', $res);
-    }
-
-    //编辑商品分组
-    public static function edit(array $data = []): Json
-    {
-        $rs = GoodGroupModel::field('id,company_id,card_id')
-            ->where([
-                'id' => $data['id'],
-                'is_del' => CommonModel::$del_normal
-            ])
-            ->findOrEmpty();
-        if ($rs->isEmpty()) return json_show(CommonModel::$error_param, '该商品分组不存在');
-
-        if (($rs->company_id != $data['company_id']) || ($rs->card_id != $data['card_id'])) {
-            $temp = GoodGroupModel::field('id')
-                ->where([
-                    'is_del' => CommonModel::$del_normal,
-                    'company_id' => $data['company_id'],
-                    'card_id' => $data['card_id']
-                ])
-                ->findOrEmpty()
-                ->isEmpty();
-            if (!$temp) return json_show(CommonModel::$error_param, '该分组已存在');
-        }
-
-        $date = date('Y-m-d H:i:s');
-
-        $res = GoodGroupModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => $date, 'updaterid' => self::$uid, 'updater' => self::$uname]));
-
-        return $res ? json_show(CommonModel::$success, '编辑商品分组成功') : json_show(CommonModel::$success, '编辑商品分组失败');
-
-    }
-
-    //商品分组启禁用
-    public static function status(array $data = []): Json
-    {
-        $res = GoodGroupModel::where('id', $data['id'])
-            ->where('status', '<>', $data['status'])
-            ->save([
-                'status' => $data['status'],
-                'updatetime' => date('Y-m-d H:i:s'),
-                'updaterid' => self::$uid,
-                'updater' => self::$uname
-            ]);
-
-        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败');
-
-    }
-
-    //删除商品分组
-    public static function delete(array $ids = []): Json
-    {
-
-        Db::startTrans();
-        try {
-
-            $res = GoodGroupModel::whereIn('id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->save([
-                    'is_del' => CommonModel::$del_deleted,
-                    'updatetime' => date('Y-m-d H:i:s'),
-                    'updaterid' => self::$uid,
-                    'updater' => self::$uname
-                ]);
-
-            if (!$res) throw new Exception('该商品分组不存在');
-
-            Db::name('good_group_item')
-                ->whereIn('good_group_id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->update([
-                    'is_del' => CommonModel::$del_deleted,
-                    'updatetime' => date('Y-m-d H:i:s')
-                ]);
-
-            Db::commit();
-            return json_show(CommonModel::$success, '删除成功');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '删除失败,' . $exception->getMessage());
-
-        }
-    }
-
-
-}

app/admin/logic/GroupItemLogic.php

@@ -0,0 +1,229 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\model\CommonModel;
+use app\model\GroupModel;
+use app\model\GoodModel;
+use app\model\VideoModel;
+use think\Exception;
+use think\exception\ValidateException;
+use think\facade\Db;
+use think\response\Json;
+
+class GroupItemLogic extends BaseLogic
+{
+
+    //列表
+    public static function list(array $data = []): Json
+    {
+        $db = Db::name('group_item')
+            ->alias('a')
+            ->where(['a.is_del' => CommonModel::$del_normal, 'group_id' => $data['group_id']]);
+
+        if ($data['type'] == GroupModel::$type_good) {
+            $db->leftJoin('good b', 'b.id=a.item_id AND b.is_del=' . CommonModel::$del_normal);
+            $name = 'good_name';
+            $field = 'a.id,b.good_code code,b.good_name title,b.good_remark remark,a.is_top,a.weight';
+
+        } else {
+            $db->leftJoin('video b', 'b.id=a.item_id AND b.is_del=' . CommonModel::$del_normal);
+            $name = 'video_name';
+            $field = 'a.id,b.video_sn code,b.video_name title,b.remark,a.is_top,a.weight';
+        }
+
+        if ($data['title'] != '') $db->whereLike($name, '%' . $data['title'] . '%');
+
+        $count = $db->count('a.id');
+
+        $list = $db->field($field)
+            ->page($data['page'], $data['size'])
+            ->order(['a.weight' => 'desc', 'a.id' => 'desc'])
+            ->select()
+            ->toArray();
+
+        return json_show(CommonModel::$success, '获取分组明细列表成功', ['count' => $count, 'list' => $list]);
+    }
+
+    //添加
+    public static function add(array $data = []): Json
+    {
+
+        Db::startTrans();
+
+        try {
+
+            $rs = GroupModel::field('id')
+                ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
+                ->findOrEmpty()
+                ->isEmpty();
+            if ($rs) throw new Exception('该分组不存在');
+
+            if ($data['type'] == GroupModel::$type_good) {
+                $rs = GoodModel::field('id')
+                    ->where(['id' => $data['item_id'], 'is_del' => CommonModel::$del_normal])
+                    ->findOrEmpty()
+                    ->isEmpty();
+                if ($rs) throw new Exception('该商品不存在');
+                Db::name('group')
+                    ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
+                    ->inc('good_num', 1)
+                    ->update(['updatetime' => date('Y-m-d H:i:s')]);
+            } else {
+                $rs = VideoModel::field('id')
+                    ->where(['id' => $data['item_id'], 'is_del' => CommonModel::$del_normal])
+                    ->findOrEmpty()
+                    ->isEmpty();
+                if ($rs) throw new Exception('该视频不存在');
+                Db::name('group')
+                    ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
+                    ->inc('video_num', 1)
+                    ->update(['updatetime' => date('Y-m-d H:i:s')]);
+            }
+
+
+            $rs = Db::name('group_item')
+                ->field('id')
+                ->where([
+                    'is_del' => CommonModel::$del_normal,
+                    'group_id' => $data['group_id'],
+                    'type' => $data['type'],
+                    'item_id' => $data['item_id']
+                ])
+                ->findOrEmpty();
+            if (!empty($rs)) throw new Exception('该明细已存在,不能在同一分组下重复添加');
+
+            $res = Db::name('group_item')
+                ->insert(array_merge($data, [
+                    'is_del' => CommonModel::$del_normal,
+                    'addtime' => date('Y-m-d H:i:s'),
+                    'updatetime' => date('Y-m-d H:i:s'),
+                ]));
+
+            Db::commit();
+
+            return $res ? json_show(CommonModel::$success, '添加分组明细成功') : json_show(CommonModel::$success, '添加分组明细失败');
+
+        } catch (Exception $exception) {
+            Db::rollback();
+            return json_show(CommonModel::$error_param, '添加分组明细失败,' . $exception->getMessage());
+        }
+    }
+
+    //获取详情
+    public static function read(int $id = 0): Json
+    {
+        $res = Db::name('group_item')
+            ->field(true)
+            ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty();
+
+        if (empty($res)) throw new ValidateException('该分组明细为空');
+
+        return json_show(CommonModel::$success, '获取分组明细详情成功', $res);
+    }
+
+    //编辑
+    public static function edit(array $data = []): Json
+    {
+        $rs = Db::name('group_item')
+            ->field('id,group_id,type,item_id')
+            ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty();
+        if (empty($rs)) return json_show(CommonModel::$error_param, '该分组明细不存在');
+
+        if ($rs['item_id'] != $data['item_id']) {
+            $temp = Db::name('group_item')
+                ->field('id,group_id,type,item_id')
+                ->where([
+                    'is_del' => CommonModel::$del_normal,
+                    'group_id' => $rs['group_id'],
+                    'type' => $rs['type'],
+                    'item_id' => $data['item_id']
+                ])->findOrEmpty();
+
+            if (!empty($temp)) return json_show(CommonModel::$error_param, '该明细已存在,不能在同一分组下重复添加');
+
+        }
+
+        if ($rs['type'] == GroupModel::$type_good) {
+            $result = GoodModel::field('id')
+                ->where(['id' => $data['item_id'], 'is_del' => CommonModel::$del_normal])
+                ->findOrEmpty()
+                ->isEmpty();
+            if ($result) return json_show(CommonModel::$error_param, '该商品不存在');
+
+        } else {
+            $result = VideoModel::field('id')
+                ->where(['id' => $data['item_id'], 'is_del' => CommonModel::$del_normal])
+                ->findOrEmpty()
+                ->isEmpty();
+            if ($result) return json_show(CommonModel::$error_param, '该视频不存在');
+
+        }
+
+        $res = Db::name('group_item')
+            ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s')]));
+
+        return $res ? json_show(CommonModel::$success, '编辑分组明细成功') : json_show(CommonModel::$error_param, '编辑分组明细失败');
+
+    }
+
+    //删除
+    public static function delete(array $ids = []): Json
+    {
+        Db::startTrans();
+
+        try {
+
+            $group_id = Db::name('group_item')
+                ->whereIn('id', $ids)
+                ->where('is_del', CommonModel::$del_normal)
+                ->group('group_id,type')
+                ->column('group_id,type');
+
+            if (count($group_id) > 1) throw new Exception('不能删除不同分组下不同类型的明细');
+
+            $num = Db::name('group_item')
+                ->whereIn('id', $ids)
+                ->where('is_del', CommonModel::$del_normal)
+                ->update([
+                    'is_del' => CommonModel::$del_deleted,
+                    'updatetime' => date('Y-m-d H:i:s'),
+                ]);
+
+            if ($group_id[0]['type'] == GroupModel::$type_good) $field = 'good_num';
+            else  $field = 'video_num';
+
+            Db::name('group')
+                ->where(['id' => $group_id[0]['group_id'], 'is_del' => CommonModel::$del_normal])
+                ->dec($field, $num)
+                ->update([
+                    'updatetime' => date('Y-m-d H:i:s'),
+                    'updaterid' => self::$uid,
+                    'updater' => self::$uname
+                ]);
+
+            Db::commit();
+
+            return $num ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败,该分组明细不存在');
+
+        } catch (Exception $exception) {
+            Db::rollback();
+            return json_show(CommonModel::$error_param, '删除分组明细失败,' . $exception->getMessage());
+        }
+    }
+
+    //置顶
+    public static function top(array $data = []): Json
+    {
+        $res = Db::name('group_item')
+            ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+            ->where('is_top', '<>', $data['is_top'])
+            ->update(['is_top' => $data['is_top'], 'updatetime' => date('Y-m-d H:i:s')]);
+
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败');
+    }
+
+}

app/admin/logic/VideoGroupLogic.php → app/admin/logic/GroupLogic.php

@@ -3,19 +3,19 @@
 namespace app\admin\logic;
 
 use app\model\CommonModel;
-use app\model\VideoGroupModel;
+use app\model\GroupModel;
 use think\Exception;
 use think\exception\ValidateException;
 use think\facade\Db;
 use think\response\Json;
 
-class VideoGroupLogic extends BaseLogic
+class GroupLogic extends BaseLogic
 {
 
-    //获取视频分组列表
+    //获取列表
     public static function list(array $data = []): Json
     {
-        $db = VideoGroupModel::alias('a')
+        $db = GroupModel::alias('a')
             ->leftJoin('company b', 'b.id=a.company_id AND b.is_del=' . CommonModel::$del_normal)
             ->leftJoin('card c', 'c.id=a.card_id AND c.is_del=' . CommonModel::$del_normal)
             ->where('a.is_del', CommonModel::$del_normal);
@@ -26,20 +26,20 @@ class VideoGroupLogic extends BaseLogic
 
         $count = $db->count('a.id');
 
-        $list = $db->field('a.id,b.title company_title,c.title card_title,a.num,a.status,a.addtime,a.is_top')
+        $list = $db->field('a.id,b.title company_title,c.title card_title,a.video_num,a.good_num,a.status,a.addtime')
             ->page($data['page'], $data['size'])
-            ->order(['a.is_top' => 'desc', 'a.id' => 'desc'])
+            ->order(['a.id' => 'desc'])
             ->select()
             ->toArray();
 
-        return json_show(CommonModel::$success, '获取视频分组列表成功', ['count' => $count, 'list' => $list]);
+        return json_show(CommonModel::$success, '获取列表成功', ['count' => $count, 'list' => $list]);
     }
 
-    //添加视频分组
+    //添加
     public static function add(array $data = []): Json
     {
 
-        $rs = VideoGroupModel::field('id')
+        $rs = GroupModel::field('id')
             ->where([
                 'is_del' => CommonModel::$del_normal,
                 'company_id' => $data['company_id'],
@@ -49,9 +49,9 @@ class VideoGroupLogic extends BaseLogic
             ->isEmpty();
         if (!$rs) return json_show(CommonModel::$error_param, '该分组已存在');
 
-        $res = VideoGroupModel::create(array_merge($data, [
-            'num' => 0,
-            'is_top' => CommonModel::$top_no,
+        $res = GroupModel::create(array_merge($data, [
+            'video_num' => 0,
+            'good_num' => 0,
             'status' => CommonModel::$status_normal,
             'is_del' => CommonModel::$del_normal,
             'createrid' => self::$uid,
@@ -62,38 +62,38 @@ class VideoGroupLogic extends BaseLogic
             'updatetime' => date('Y-m-d H:i:s'),
         ]))->save();
 
-        return $res ? json_show(CommonModel::$success, '添加视频分组成功') : json_show(CommonModel::$success, '添加视频分组失败');
+        return $res ? json_show(CommonModel::$success, '添加成功') : json_show(CommonModel::$success, '添加失败');
 
     }
 
-    //获取视频分组详情
+    //获取详情
     public static function read(int $id = 0): Json
     {
-        $res = VideoGroupModel::field(true)
+        $res = GroupModel::field(true)
             ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
             ->findOrEmpty()
             ->toArray();
 
-        if (empty($res)) throw new ValidateException('该视频分组为空');
+        if (empty($res)) throw new ValidateException('该分组为空');
 
-        return json_show(CommonModel::$success, '获取视频分组详情成功', $res);
+        return json_show(CommonModel::$success, '获取详情成功', $res);
     }
 
-    //编辑视频分组
+    //编辑
     public static function edit(array $data = []): Json
     {
 
-        $rs = VideoGroupModel::field('id,company_id,card_id')
+        $rs = GroupModel::field('id,company_id,card_id')
             ->where([
                 'id' => $data['id'],
                 'is_del' => CommonModel::$del_normal,
             ])
             ->findOrEmpty();
-        if ($rs->isEmpty()) return json_show(CommonModel::$error_param, '该视频分组不存在');
+        if ($rs->isEmpty()) return json_show(CommonModel::$error_param, '该分组不存在');
 
         if (($rs->company_id != $data['company_id']) || ($rs->card_id != $data['card_id'])) {
 
-            $temp = VideoGroupModel::field('id')
+            $temp = GroupModel::field('id')
                 ->where([
                     'is_del' => CommonModel::$del_normal,
                     'company_id' => $data['company_id'],
@@ -101,20 +101,20 @@ class VideoGroupLogic extends BaseLogic
                 ])
                 ->findOrEmpty()
                 ->isEmpty();
-            if (!$temp) return json_show(CommonModel::$error_param, '该视频分组已存在');
+            if (!$temp) return json_show(CommonModel::$error_param, '该分组已存在');
         }
 
-        $res = VideoGroupModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+        $res = GroupModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
             ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s'), 'updaterid' => self::$uid, 'updater' => self::$uname]));
 
-        return $res ? json_show(CommonModel::$success, '编辑视频分组成功') : json_show(CommonModel::$error_param, '编辑视频分组失败');
+        return $res ? json_show(CommonModel::$success, '编辑成功') : json_show(CommonModel::$error_param, '编辑失败');
 
     }
 
-    //视频分组启禁用
+    //启禁用
     public static function status(array $data = []): Json
     {
-        $res = VideoGroupModel::where('id', $data['id'])
+        $res = GroupModel::where('id', $data['id'])
             ->where('status', '<>', $data['status'])
             ->save([
                 'status' => $data['status'],
@@ -123,17 +123,17 @@ class VideoGroupLogic extends BaseLogic
                 'updater' => self::$uname
             ]);
 
-        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该视频分组不存在或重复操作');
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该分组不存在或重复操作');
 
     }
 
-    //删除视频分组
+    //删除
     public static function delete(array $ids = []): Json
     {
         Db::startTrans();
         try {
 
-            VideoGroupModel::whereIn('id', $ids)
+            GroupModel::whereIn('id', $ids)
                 ->where('is_del', CommonModel::$del_normal)
                 ->save([
                     'is_del' => CommonModel::$del_deleted,
@@ -142,9 +142,9 @@ class VideoGroupLogic extends BaseLogic
                     'updater' => self::$uname
                 ]);
 
-            Db::name('video_group_item')
-                ->whereIn('video_group_id', $ids)
+            Db::name('group_item')
                 ->where('is_del', CommonModel::$del_normal)
+                ->whereIn('group_id', $ids)
                 ->save([
                     'is_del' => CommonModel::$del_deleted,
                     'updatetime' => date('Y-m-d H:i:s'),
@@ -158,10 +158,10 @@ class VideoGroupLogic extends BaseLogic
         }
     }
 
-    //视频分组置顶
+    //置顶
     public static function top(array $data = []): Json
     {
-        $res = VideoGroupModel::where('id', $data['id'])
+        $res = GroupModel::where('id', $data['id'])
             ->where('is_top', '<>', $data['is_top'])
             ->save([
                 'is_top' => $data['is_top'],
@@ -170,7 +170,7 @@ class VideoGroupLogic extends BaseLogic
                 'updater' => self::$uname
             ]);
 
-        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该视频分组不存在或重复操作');
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该不存在或重复操作');
 
     }
 

app/admin/logic/OrderExchangeLogic.php

@@ -18,6 +18,7 @@ class OrderExchangeLogic extends BaseLogic
             ->leftJoin('card c', 'c.id=a.card_id AND c.is_del=' . CommonModel::$del_normal)
             ->leftJoin('account d', 'd.id=a.uid AND d.is_del=' . CommonModel::$del_normal)
             ->leftJoin('addr e', 'e.id=a.addr_id AND e.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('good f', 'f.id=a.good_id AND f.is_del=' . CommonModel::$del_normal)->where('a.is_del', CommonModel::$del_normal)
             ->where('a.is_del', CommonModel::$del_normal);
 
         if ($data['orderCode'] != '') $db->whereLike('a.orderCode', '%' . $data['orderCode'] . '%');
@@ -29,7 +30,7 @@ class OrderExchangeLogic extends BaseLogic
         $count = $db->count('a.id');
 
         $list = $db
-            ->field('a.id,a.orderCode,b.title company_title,c.title card_title,d.name,d.username,a.num,e.contactor,e.mobile,e.addr_code,a.status,a.post_name,a.post_code,a.addtime,e.addr_code,"" addr_name')
+            ->field('a.id,a.orderCode,b.title company_title,c.title card_title,d.name,d.username,a.num,e.contactor,e.mobile,e.addr_code,a.status,a.post_name,a.post_code,a.addtime,e.addr_code,"" addr_name,e.addr,f.good_code,f.good_name,f.good_cover_img')
             ->page($data['page'], $data['size'])
             ->withAttr('addr_code', function ($val) {
                 return explode(',', $val);

app/admin/logic/VideoGroupItemLogic.php

@@ -1,172 +0,0 @@
-<?php
-
-namespace app\admin\logic;
-
-use app\model\CommonModel;
-use app\model\VideoGroupModel;
-use app\model\VideoModel;
-use think\Exception;
-use think\exception\ValidateException;
-use think\facade\Db;
-use think\response\Json;
-
-class VideoGroupItemLogic extends BaseLogic
-{
-
-    //列表
-    public static function list(array $data = []): Json
-    {
-        $db = Db::name('video_group_item')
-            ->alias('a')
-            ->leftJoin('video b', 'b.id=a.video_id AND b.is_del=' . CommonModel::$del_normal)
-            ->where(['a.is_del' => CommonModel::$del_normal, 'video_group_id' => $data['video_group_id']]);
-
-        if ($data['video_title'] != '') $db->whereLike('b.video_name', '%' . $data['video_title'] . '%');
-
-        $count = $db->count('a.id');
-
-        $list = $db->field('a.id,b.video_name,b.remark video_remark,a.is_top')
-            ->page($data['page'], $data['size'])
-            ->order(['a.is_top' => 'desc', 'a.id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        return json_show(CommonModel::$success, '获取视频分组明细列表成功', ['count' => $count, 'list' => $list]);
-    }
-
-    //添加
-    public static function add(array $data = []): Json
-    {
-
-        Db::startTrans();
-
-        try {
-
-            $rs = VideoGroupModel::field('id')
-                ->where(['id' => $data['video_group_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty()
-                ->isEmpty();
-            if ($rs) throw new Exception('该视频分组不存在');
-
-            $rs = VideoModel::field('id')
-                ->where(['id' => $data['video_id'], 'is_del' => CommonModel::$del_normal])
-                ->findOrEmpty()
-                ->isEmpty();
-            if ($rs) throw new Exception('该视频不存在');
-
-            $rs = Db::name('video_group_item')
-                ->field('id')
-                ->where([
-                    'is_del' => CommonModel::$del_normal,
-                    'video_group_id' => $data['video_group_id'],
-                    'video_id' => $data['video_id']])
-                ->findOrEmpty();
-            if (!empty($rs)) throw new Exception('该视频已存在，不能在同一视频分组下重复添加');
-
-            $res = Db::name('video_group_item')
-                ->insert(array_merge($data, [
-                    'is_top' => CommonModel::$top_no,
-                    'is_del' => CommonModel::$del_normal,
-                    'addtime' => date('Y-m-d H:i:s'),
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ]));
-
-            Db::name('video_group')
-                ->where(['id' => $data['video_group_id'], 'is_del' => CommonModel::$del_normal])
-                ->inc('num', $res)
-                ->update(['updatetime' => date('Y-m-d H:i:s')]);
-
-            Db::commit();
-
-            return $res ? json_show(CommonModel::$success, '添加视频分组明细成功') : json_show(CommonModel::$success, '添加视频分组明细失败');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '添加视频分组明细失败,' . $exception->getMessage());
-        }
-    }
-
-    //获取详情
-    public static function read(int $id = 0): Json
-    {
-        $res = Db::name('video_group_item')
-            ->field(true)
-            ->where(['id' => $id, 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty();
-
-        if (empty($res)) throw new ValidateException('该视频分组明细为空');
-
-        return json_show(CommonModel::$success, '获取视频分组明细详情成功', $res);
-    }
-
-    //编辑
-    public static function edit(array $data = []): Json
-    {
-        $rs = VideoModel::field('id')
-            ->where(['id' => $data['video_id'], 'is_del' => CommonModel::$del_normal])
-            ->findOrEmpty()
-            ->isEmpty();
-        if ($rs) return json_show(CommonModel::$error_param, '该视频不存在');
-
-        $res = Db::name('video_group_item')
-            ->where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s')]));
-
-        return $res ? json_show(CommonModel::$success, '编辑视频分组明细成功') : json_show(CommonModel::$error_param, '编辑视频分组明细失败');
-
-    }
-
-    //删除
-    public static function delete(array $ids = []): Json
-    {
-        Db::startTrans();
-
-        try {
-
-            $video_group_id = Db::name('video_group_item')
-                ->whereIn('id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->group('video_group_id')
-                ->column('video_group_id');
-
-            if (count($video_group_id) > 1) throw new Exception('不能删除不同分组下的视频');
-
-            $num = Db::name('video_group_item')
-                ->whereIn('id', $ids)
-                ->where('is_del', CommonModel::$del_normal)
-                ->update([
-                    'is_del' => CommonModel::$del_deleted,
-                    'updatetime' => date('Y-m-d H:i:s'),
-                ]);
-
-            Db::name('video_group')
-                ->where(['id' => $video_group_id[0], 'is_del' => CommonModel::$del_normal])
-                ->dec('num', $num)
-                ->update(['updatetime' => date('Y-m-d H:i:s')]);
-
-            Db::commit();
-
-            return $num ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败,该视频分组明细不存在');
-
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '删除视频分组明细失败,' . $exception->getMessage());
-        }
-    }
-
-    //置顶
-    public static function top(array $data = []): Json
-    {
-        $res = Db::name('video_group_item')
-            ->where('id', $data['id'])
-            ->where('is_top', '<>', $data['is_top'])
-            ->update([
-                'is_top' => $data['is_top'],
-                'updatetime' => date('Y-m-d H:i:s'),
-            ]);
-
-        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该视频分组明细不存在或重复操作');
-
-    }
-
-}

app/admin/route/app.php

@@ -72,21 +72,20 @@ Route::rule('companyEdit', 'admin/Company/edit');//编辑企业
 Route::rule('companyChange', 'admin/Company/status');//企业启禁用
 Route::rule('companyDelete', 'admin/Company/delete');//删除企业
 
-//【视频分组】
-Route::rule('videoGroupList', 'admin/VideoGroup/list');//获取视频分组列表
-Route::rule('videoGroupAdd', 'admin/VideoGroup/add');//添加视频分组
-Route::rule('videoGroupRead', 'admin/VideoGroup/read');//获取视频分组详情
-Route::rule('videoGroupEdit', 'admin/VideoGroup/edit');//编辑视频分组
-Route::rule('videoGroupChange', 'admin/VideoGroup/status');//视频分组启禁用
-Route::rule('videoGroupDelete', 'admin/VideoGroup/delete');//删除视频分组
-Route::rule('videoGroupTop', 'admin/VideoGroup/top');//视频分组置顶
-//【视频分组明细】
-Route::rule('videoGroupItemList', 'admin/VideoGroupItem/list');//列表
-Route::rule('videoGroupItemAdd', 'admin/VideoGroupItem/add');//添加
-Route::rule('videoGroupItemRead', 'admin/VideoGroupItem/read');//获取详情
-Route::rule('videoGroupItemEdit', 'admin/VideoGroupItem/edit');//编辑
-Route::rule('videoGroupItemDelete', 'admin/VideoGroupItem/delete');//删除
-Route::rule('videoGroupItemTop', 'admin/VideoGroupItem/top');//置顶
+//【企业和卡类型批量设置】
+Route::rule('groupList', 'admin/Group/list');//列表
+Route::rule('groupAdd', 'admin/Group/add');//添加
+Route::rule('groupRead', 'admin/Group/read');//详情
+Route::rule('groupEdit', 'admin/Group/edit');//编辑
+Route::rule('groupChange', 'admin/Group/status');//启禁用
+Route::rule('groupDelete', 'admin/Group/delete');//删除
+//【企业和卡类型批量设置明细】
+Route::rule('groupItemList', 'admin/GroupItem/list');//列表
+Route::rule('groupItemAdd', 'admin/GroupItem/add');//添加
+Route::rule('groupItemRead', 'admin/GroupItem/read');//获取详情
+Route::rule('groupItemEdit', 'admin/GroupItem/edit');//编辑
+Route::rule('groupItemDelete', 'admin/GroupItem/delete');//删除
+Route::rule('groupItemTop', 'admin/GroupItem/top');//置顶
 
 //【商品】
 Route::rule('goodList', 'admin/Good/list');//获取商品列表
@@ -96,20 +95,6 @@ Route::rule('goodEdit', 'admin/Good/edit');//编辑商品
 Route::rule('goodChange', 'admin/Good/status');//商品启禁用
 Route::rule('goodDelete', 'admin/Good/delete');//删除商品
 
-//【商品分组】
-Route::rule('goodGroupList', 'admin/GoodGroup/list');//列表
-Route::rule('goodGroupAdd', 'admin/GoodGroup/add');//添加
-Route::rule('goodGroupRead', 'admin/GoodGroup/read');//获取详情
-Route::rule('goodGroupEdit', 'admin/GoodGroup/edit');//编辑
-Route::rule('goodGroupChange', 'admin/GoodGroup/status');//启禁用
-Route::rule('goodGroupDelete', 'admin/GoodGroup/delete');//删除
-//【商品分组明细】
-Route::rule('goodGroupItemList', 'admin/GoodGroupItem/list');//列表
-Route::rule('goodGroupItemAdd', 'admin/GoodGroupItem/add');//添加
-Route::rule('goodGroupItemRead', 'admin/GoodGroupItem/read');//获取详情
-Route::rule('goodGroupItemEdit', 'admin/GoodGroupItem/edit');//编辑
-Route::rule('goodGroupItemDelete', 'admin/GoodGroupItem/delete');//删除
-Route::rule('goodGroupItemTop', 'admin/GoodGroupItem/top');//置顶
 
 //【兑换商品库存】
 Route::rule('inventoryExchangeList', 'admin/InventoryExchange/list');//获取兑换商品列表

app/model/GroupModel.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace app\model;
+
+use think\Model;
+
+class GroupModel extends Model
+{
+    protected $table = 'fc_group';
+    protected $pk = 'id';
+
+
+    public static $type_good = 1;//分组明细，商品
+    public static $type_video = 2;//分组明细，视频
+
+}