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

app/admin/config/validate_rules.php

@@ -155,6 +155,14 @@ return [
         'inventory|库存数' => 'require|number|gt:0|lt:999999999',
     ],
 
+    //【兑换商品库存】
+    //添加
+    'InventoryExchangeAdd' => [
+        'account_id|账户id' => 'require|number|gt:0',
+        'good_id|商品id' => 'require|number|gt:0',
+        'inventory|库存数' => 'require|number|gt:0|lt:999999999',
+    ],
+
     //【账户】
     //添加
     'AccountAdd' => [
@@ -177,7 +185,6 @@ return [
         'suffix_end|账户后缀结束值' => 'require|number|max:9999|gt:suffix_start',
         'starttime|开始日期' => 'require|date|lt:expiretime',
         'expiretime|结束日期' => 'require|date|gt:starttime',
-        'video_ids|视频id集合' => 'require|array|max:100',
     ],
 
 ];

app/admin/controller/Account.php

@@ -57,7 +57,7 @@ class Account extends BaseController
     public function batchAdd()
     {
 
-        $param = $this->request->only(['company_id', 'card_id', 'username_prefix', 'suffix_start', 'suffix_end', 'starttime', 'expiretime', 'video_ids'], 'post');
+        $param = $this->request->only(['company_id', 'card_id', 'username_prefix', 'suffix_start', 'suffix_end', 'starttime', 'expiretime'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.AccountBatchAdd'));
 

app/admin/logic/AccountLogic.php

@@ -125,7 +125,6 @@ class AccountLogic extends BaseLogic
                 'password' => getPassword($pwd, $salt),
                 'company_id' => $data['company_id'],
                 'card_id' => $data['card_id'],
-                'video_ids' => implode(',', $data['video_ids']),
                 'status' => AccountModel::$status_not_active,
                 'is_del' => CommonModel::$del_normal,
                 'starttime' => $data['starttime'],