分组优化

app/admin/controller/Group.php

@@ -9,13 +9,13 @@ use think\exception\ValidateException;
 use think\facade\Config;
 use think\facade\Validate;
 
-//【企业和卡类型批量设置表】
+//【企业和卡类型组合表】
 class Group extends BaseController
 {
     //列表
     public function list()
     {
-        $param = $this->request->only(['page' => 1, 'size' => 10, 'status' => '', 'company_title' => '', 'card_title' => ''], 'post');
+        $param = $this->request->only(['page' => 1, 'size' => 10, 'status' => '', 'company_title' => '', 'card_title' => '', 'combination' => ''], 'post');
 
         return GroupLogic::list($param);
     }

app/admin/controller/GroupItem.php

@@ -72,7 +72,7 @@ class GroupItem extends BaseController
         return GroupItemLogic::delete($ids);
     }
 
-    //删除分组明细
+    //置顶
     public function top()
     {
         $param = $this->request->only(['id', 'is_top'], 'post');

app/admin/logic/GroupItemLogic.php

@@ -223,7 +223,7 @@ class GroupItemLogic extends BaseLogic
             ->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, '操作失败');
+        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$error_param, '操作失败,该明细不存在或重复操作');
     }
 
 }

app/admin/logic/GroupLogic.php

@@ -2,7 +2,9 @@
 
 namespace app\admin\logic;
 
+use app\model\CardModel;
 use app\model\CommonModel;
+use app\model\CompanyModel;
 use app\model\GroupModel;
 use think\Exception;
 use think\exception\ValidateException;
@@ -23,10 +25,11 @@ class GroupLogic extends BaseLogic
         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'] . '%');
+        if ($data['combination'] != '') $db->whereLike('a.combination', '%' . $data['combination'] . '%');
 
         $count = $db->count('a.id');
 
-        $list = $db->field('a.id,b.title company_title,c.title card_title,a.video_num,a.good_num,a.status,a.addtime')
+        $list = $db->field('a.id,b.title company_title,c.title card_title,a.combination,a.status,a.addtime')
             ->page($data['page'], $data['size'])
             ->order(['a.id' => 'desc'])
             ->select()
@@ -40,29 +43,31 @@ class GroupLogic extends BaseLogic
     {
 
         $rs = GroupModel::field('id')
-            ->where([
-                'is_del' => CommonModel::$del_normal,
-                'company_id' => $data['company_id'],
-                'card_id' => $data['card_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, '该分组已存在');
 
+        $company = CompanyModel::field('id,title')
+            ->where(['is_del' => CommonModel::$del_normal, 'id' => $data['company_id']])
+            ->findOrEmpty();
+        if ($company->isEmpty()) return json_show(CommonModel::$error_param, '该企业不存在');
+
+        $card = CardModel::field('id,title')
+            ->where(['is_del' => CommonModel::$del_normal, 'id' => $data['card_id']])
+            ->findOrEmpty();
+        if ($card->isEmpty()) return json_show(CommonModel::$error_param, '该卡类型不存在');
+
+
         $res = GroupModel::create(array_merge($data, [
-            'video_num' => 0,
-            'good_num' => 0,
+            'combination' => $company->title . '_' . $card->title,
             'status' => CommonModel::$status_normal,
             'is_del' => CommonModel::$del_normal,
-            'createrid' => self::$uid,
-            'creater' => self::$uname,
             'addtime' => date('Y-m-d H:i:s'),
-            'updaterid' => self::$uid,
-            'updater' => self::$uname,
             '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, '添加分组失败');
 
     }
 
@@ -94,18 +99,27 @@ class GroupLogic extends BaseLogic
         if (($rs->company_id != $data['company_id']) || ($rs->card_id != $data['card_id'])) {
 
             $temp = GroupModel::field('id')
-                ->where([
-                    'is_del' => CommonModel::$del_normal,
-                    'company_id' => $data['company_id'],
-                    'card_id' => $data['card_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, '该分组已存在');
+
+            $company = CompanyModel::field('id,title')
+                ->where(['is_del' => CommonModel::$del_normal, 'id' => $data['company_id']])
+                ->findOrEmpty();
+            if ($company->isEmpty()) return json_show(CommonModel::$error_param, '该企业不存在');
+
+            $card = CardModel::field('id,title')
+                ->where(['is_del' => CommonModel::$del_normal, 'id' => $data['card_id']])
+                ->findOrEmpty();
+            if ($card->isEmpty()) return json_show(CommonModel::$error_param, '该卡类型不存在');
+
+            $data['combination'] = $company->title . '_' . $card->title;
+
         }
 
         $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]));
+            ->save(array_merge($data, ['updatetime' => date('Y-m-d H:i:s')]));
 
         return $res ? json_show(CommonModel::$success, '编辑成功') : json_show(CommonModel::$error_param, '编辑失败');
 
@@ -119,8 +133,6 @@ class GroupLogic extends BaseLogic
             ->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, '操作失败，该分组不存在或重复操作');
@@ -130,48 +142,12 @@ class GroupLogic extends BaseLogic
     //删除
     public static function delete(array $ids = []): Json
     {
-        Db::startTrans();
-        try {
-
-            GroupModel::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
-                ]);
-
-            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'),
-                ]);
-
-            Db::commit();
-            return json_show(CommonModel::$success, '删除成功');
-        } catch (Exception $exception) {
-            Db::rollback();
-            return json_show(CommonModel::$error_param, '删除失败,' . $exception->getMessage());
-        }
-    }
-
-    //置顶
-    public static function top(array $data = []): Json
-    {
-        $res = GroupModel::where('id', $data['id'])
-            ->where('is_top', '<>', $data['is_top'])
-            ->save([
-                'is_top' => $data['is_top'],
-                'updatetime' => date('Y-m-d H:i:s'),
-                'updaterid' => self::$uid,
-                'updater' => self::$uname
-            ]);
-
-        return $res ? json_show(CommonModel::$success, '操作成功') : json_show(CommonModel::$success, '操作失败，该不存在或重复操作');
+        $rs = GroupModel::whereIn('id', $ids)
+            ->where('is_del', CommonModel::$del_normal)
+            ->save(['is_del' => CommonModel::$del_deleted, 'updatetime' => date('Y-m-d H:i:s')]);
 
+        return $rs ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$success, '删除失败');
     }
 
+
 }

app/model/GroupModel.php

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