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

app/admin/config/validate_rules.php

@@ -133,19 +133,19 @@ return [
         'new_password|新密码' => 'require|min:6|max:255',
     ],
 
-    //【企业和卡类型批量设置】
+    //【企业和卡类型组合】
     //添加
     'GroupAdd' => [
         'company_id|企业id' => 'require|number|gt:0',
         'card_id|卡类型id' => 'require|number|gt:0',
         'remark|备注' => 'max:255',
     ],
-    //【企业和卡类型批量设置明细】
+    //【公司商品】
     //添加
-    'GroupItemAdd' => [
+    'CompanyGoodAdd' => [
         'group_id|分组id' => 'require|number|gt:0',
-        'item_id|明细id' => 'require|number|gt:0',
-        'type|明细类型'=>'require|number|in:'.GroupModel::$type_good.','.GroupModel::$type_video,
+        'good_id|商品id' => 'require|number|gt:0',
+        'is_top|是否置顶'=>'require|number|in:'.CommonModel::$top_no.','.CommonModel::$top_yes,
         'weight|权重' => 'number|egt:0',
     ],
 

app/admin/controller/CompanyGood.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace app\admin\controller;
+
+use app\admin\logic\CompanyGoodLogic;
+use app\BaseController;
+use app\model\CommonModel;
+use app\model\GroupModel;
+use think\exception\ValidateException;
+use think\facade\Config;
+use think\facade\Validate;
+
+//【公司商品】
+class CompanyGood extends BaseController
+{
+    //列表
+    public function list()
+    {
+        $param = $this->request->only(['group_id' => '', 'page' => 1, 'size' => 10, 'good_name' => '', 'good_code' => '', 'status' => ''], 'post');
+
+        $val = Validate::rule([
+            'group_id|分组id' => 'number|gt:0',
+            'page|页码' => 'require|number|gt:0',
+            'size|每页数量' => 'require|number|elt:100',
+            'good_name|商品名称' => 'number|elt:100',
+            'good_cood|商品编码' => 'number|elt:100',
+            'status|状态' => 'number|in:' . CommonModel::$status_normal . ',' . CommonModel::$status_disable,
+        ]);
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return CompanyGoodLogic::list($param);
+    }
+
+    //添加
+    public function add()
+    {
+        $param = $this->request->only(['group_id', 'good_id', 'is_top' => CommonModel::$top_no, 'weight' => 0], 'post');
+
+        $val = Validate::rule(Config::get('validate_rules.CompanyGoodAdd'));
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return CompanyGoodLogic::add($param);
+    }
+
+    //详情
+    public function read()
+    {
+        $id = $this->request->post('id/d', 0);
+        return CompanyGoodLogic::read($id);
+    }
+
+    //编辑
+    public function edit()
+    {
+        $param = $this->request->only(['id','group_id', 'good_id', 'is_top' => CommonModel::$top_no, 'weight' => 0], 'post');
+        $val = Validate::rule(array_merge(Config::get('validate_rules.CompanyGoodAdd'),[
+            'id|公司商品id' => 'require|number|gt:0',
+        ]));
+
+        if (!$val->check($param)) throw new ValidateException($val->getError());
+
+        return CompanyGoodLogic::edit($param);
+    }
+
+    //删除
+    public function delete()
+    {
+        $ids = $this->request->post('id/a', []);
+        return CompanyGoodLogic::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 CompanyGoodLogic::top($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 CompanyGoodLogic::status($param);
+    }
+
+}

app/admin/controller/Group.php

@@ -9,7 +9,7 @@ use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Validate;
 
-//【企业和卡类型组合表】
+//【企业和卡类型组合】
 class Group extends BaseController
 {
     //列表

app/admin/controller/GroupItem.php

@@ -1,90 +0,0 @@
-<?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/logic/CompanyGoodLogic.php

@@ -0,0 +1,177 @@
+<?php
+
+namespace app\admin\logic;
+
+use app\model\CommonModel;
+use app\model\CompanyGoodModel;
+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 CompanyGoodLogic extends BaseLogic
+{
+
+    //列表
+    public static function list(array $data = []): Json
+    {
+        $db = CompanyGoodModel::alias('a')
+            ->leftJoin('good b', 'b.id=a.good_id AND b.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('group c', 'c.id=a.group_id AND c.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('company d', 'd.id=c.company_id AND d.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('card e', 'e.id=c.card_id AND e.is_del=' . CommonModel::$del_normal)
+            ->leftJoin('unit f', 'f.id=b.unit_id AND f.is_del=' . CommonModel::$del_normal)
+            ->where(['a.is_del' => CommonModel::$del_normal]);
+
+        if ($data['group_id'] != '') $db->where('a.group_id', $data['group_id']);
+        if ($data['good_name'] != '') $db->whereLike('b.good_name', '%' . $data['good_name'] . '%');
+        if ($data['good_code'] != '') $db->whereLike('b.good_code', '%' . $data['good_code'] . '%');
+        if ($data['status'] != '') $db->where('a.status', $data['status']);
+
+        $count = $db->count('a.id');
+
+        $list = $db->field('a.id,d.title company_title,e.title card_title,a.code,b.good_code,b.good_name,b.good_cover_img,b.moq,b.step,f.unit,b.price,a.status,a.creater,a.addtime')
+            ->page($data['page'], $data['size'])
+            ->order(['a.is_top' => 'desc', 'a.weight' => 'desc', 'a.id' => 'desc'])
+            ->select()
+            ->toArray();
+
+        return json_show(CommonModel::$success, '获取公司商品列表成功', ['count' => $count, 'list' => $list]);
+    }
+
+    //添加
+    public static function add(array $data = []): Json
+    {
+
+        $rs = GroupModel::field('id')
+            ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty()
+            ->isEmpty();
+        if ($rs) return json_show(CommonModel::$error_param, '该分组不存在');
+
+        $rs = GoodModel::field('id')
+            ->where(['id' => $data['good_id'], 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty()
+            ->isEmpty();
+        if ($rs) return json_show(CommonModel::$error_param, '该商品不存在');
+
+        $rs = CompanyGoodModel::field('id')
+            ->where(['is_del' => CommonModel::$del_normal, 'group_id' => $data['group_id'], 'good_id' => $data['good_id']])
+            ->findOrEmpty()
+            ->isEmpty();
+        if (!$rs) return json_show(CommonModel::$error_param, '该公司商品已存在');
+
+        $res = CompanyGoodModel::create((array_merge($data, [
+            'code' => makeNo('CG'),
+            'is_del' => CommonModel::$del_normal,
+            'status' => CommonModel::$status_normal,
+            'creater' => self::$uname,
+            'createrid' => self::$uid,
+            'addtime' => date('Y-m-d H:i:s'),
+            'updater' => self::$uname,
+            'updaterid' => self::$uid,
+            'updatetime' => date('Y-m-d H:i:s'),
+        ])));
+
+        return $res ? json_show(CommonModel::$success, '添加公司商品成功') : json_show(CommonModel::$success, '添加公司商品失败');
+
+    }
+
+    //获取详情
+    public static function read(int $id = 0): Json
+    {
+        $res = CompanyGoodModel::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 = CompanyGoodModel::field('id')
+            ->where(['is_del' => CommonModel::$del_normal, 'id' => $data['id']])
+            ->findOrEmpty()
+            ->isEmpty();
+        if ($rs) return json_show(CommonModel::$error_param, '该公司商品不存在');
+
+        $rs = GroupModel::field('id')
+            ->where(['id' => $data['group_id'], 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty()
+            ->isEmpty();
+        if ($rs) return json_show(CommonModel::$error_param, '该分组不存在');
+
+        $rs = GoodModel::field('id')
+            ->where(['id' => $data['good_id'], 'is_del' => CommonModel::$del_normal])
+            ->findOrEmpty()
+            ->isEmpty();
+        if ($rs) return json_show(CommonModel::$error_param, '该商品不存在');
+
+        $rs = CompanyGoodModel::field('id')
+            ->where(['is_del' => CommonModel::$del_normal, 'group_id' => $data['group_id'], 'good_id' => $data['good_id']])
+            ->where('id', '<>', $data['id'])
+            ->findOrEmpty()
+            ->isEmpty();
+        if (!$rs) return json_show(CommonModel::$error_param, '该公司商品已存在');
+
+        $res = CompanyGoodModel::where('id', $data['id'])->save((array_merge($data, [
+            'updater' => self::$uname,
+            'updaterid' => self::$uid,
+            '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
+    {
+        $res = CompanyGoodModel::whereIn('id', $ids)
+            ->where('is_del', CommonModel::$del_normal)
+            ->update([
+                'is_del' => CommonModel::$del_deleted,
+                '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, '删除失败,该公司商品不存在');
+    }
+
+    //置顶
+    public static function top(array $data = []): Json
+    {
+        $res = CompanyGoodModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+            ->where('is_top', '<>', $data['is_top'])
+            ->update([
+                'is_top' => $data['is_top'],
+                'updaterid' => self::$uid,
+                'updater' => self::$uname,
+                'updatetime' => date('Y-m-d H:i:s')
+            ]);
+
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$error_param, '操作失败,该公司商品不存在或重复操作');
+    }
+
+    //启禁用
+    public static function status(array $data = []): Json
+    {
+        $res = CompanyGoodModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
+            ->where('status', '<>', $data['status'])
+            ->update([
+                'status' => $data['status'],
+                'updaterid' => self::$uid,
+                'updater' => self::$uname,
+                'updatetime' => date('Y-m-d H:i:s')
+            ]);
+
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$error_param, '操作失败,该公司商品不存在或重复操作');
+    }
+
+}

app/admin/logic/GroupItemLogic.php

@@ -1,229 +0,0 @@
-<?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::$error_param, '操作失败,该明细不存在或重复操作');
-    }
-
-}

app/admin/logic/GroupLogic.php

@@ -61,7 +61,7 @@ class GroupLogic extends BaseLogic
 
         $res = GroupModel::create(array_merge($data, [
             'combination' => $company->title . '_' . $card->title,
-            'status' => CommonModel::$status_normal,
+            'status' => CommonModel::$status_disable,//默认禁用
             'is_del' => CommonModel::$del_normal,
             'addtime' => date('Y-m-d H:i:s'),
             'updatetime' => date('Y-m-d H:i:s'),
@@ -128,6 +128,10 @@ class GroupLogic extends BaseLogic
     //启禁用
     public static function status(array $data = []): Json
     {
+        if($data['status'] == CommonModel::$status_normal){
+            //启用组合时，要验证组合下是否有启用的手机主题
+
+        }
         $res = GroupModel::where('id', $data['id'])
             ->where('status', '<>', $data['status'])
             ->save([

app/admin/route/app.php

@@ -72,20 +72,22 @@ Route::rule('companyEdit', 'admin/Company/edit');//编辑企业
 Route::rule('companyChange', 'admin/Company/status');//企业启禁用
 Route::rule('companyDelete', 'admin/Company/delete');//删除企业
 
-//【企业和卡类型批量设置】
+//【企业和卡类型组合】
 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('companyGoodList', 'admin/CompanyGood/list');//列表
+Route::rule('companyGoodAdd', 'admin/CompanyGood/add');//添加
+Route::rule('companyGoodRead', 'admin/CompanyGood/read');//获取详情
+Route::rule('companyGoodEdit', 'admin/CompanyGood/edit');//编辑
+Route::rule('companyGoodDelete', 'admin/CompanyGood/delete');//删除
+Route::rule('companyGoodStatus', 'admin/CompanyGood/status');//启禁用
+Route::rule('companyGoodTop', 'admin/CompanyGood/top');//置顶
 
 //【商品】
 Route::rule('goodList', 'admin/Good/list');//获取商品列表

app/model/CompanyGoodModel.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace app\model;
+
+use think\Model;
+
+
+class CompanyGoodModel extends Model
+{
+
+    protected $table = 'fc_company_good';
+    protected $pk = 'id';
+
+
+}
+

app/model/GroupModel.php

@@ -11,7 +11,4 @@ class GroupModel extends Model
 
     protected $hidden=['collection_account'];//收款账号，之后支付时会用到，暂时隐藏
 
-    public static $type_good = 1;//分组明细，商品
-    public static $type_video = 2;//分组明细，视频
-
 }