编辑账户优化

app/admin/controller/Account.php

@@ -44,9 +44,17 @@ class Account extends BaseController
     //编辑账户
     public function edit()
     {
-        $param = $this->request->only(['id', 'company_id', 'card_id', 'username', 'starttime', 'expiretime', 'video_ids', 'mobile' => '', 'name' => '', 'remark' => ''], 'post');
-
-        $val = Validate::rule(array_merge(Config::get('validate_rules.AccountAdd'), ['id' => 'require|number|gt:0']));
+        $param = $this->request->only(['id', 'starttime', 'expiretime', 'video_ids', 'mobile' => '', 'name' => '', 'remark' => ''], 'post');
+
+        $val = Validate::rule([
+            'id' => 'require|number|gt:0',
+            'starttime|开始日期' => 'require|date|lt:expiretime',
+            'expiretime|结束日期' => 'require|date|gt:starttime',
+            'video_ids|视频id集合' => 'require|array|max:100',
+            'mobile|手机号' => 'mobile',
+            'name|姓名' => 'max:255',
+            'remark|备注' => 'max:255',
+        ]);
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 

app/admin/logic/AccountLogic.php

@@ -92,18 +92,13 @@ class AccountLogic extends BaseLogic
 
         $date = date('Y-m-d H:i:s');
 
+        $data['video_ids'] = implode(',', $data['video_ids']);
         $res = AccountModel::where(['id' => $data['id'], 'is_del' => CommonModel::$del_normal])
-            ->save([
-                'username' => $data['username'],
-                'company_id' => $data['company_id'],
-                'card_id' => $data['card_id'],
-                'video_ids' => implode(',', $data['video_ids']),
-                'starttime' => $data['starttime'],
-                'expiretime' => $data['expiretime'],
+            ->save(array_merge($data, [
                 'updaterid' => self::$uid,
                 'updater' => self::$uname,
                 'updatetime' => $date,
-            ]);
+            ]));
 
         return $res ? json_show(CommonModel::$success, '账户修改成功') : json_show(CommonModel::$error_param, '账户修改失败');