zxiansheng 3 лет назад
Родитель
Сommit
69738d2bfc

+ 4 - 0
common/config/params.php

@@ -196,6 +196,10 @@ return [
             'name' => 'cash',
             'label' => '会员账户余额',
         ],
+        'exchange_points' => [
+            'name' => 'bonus',
+            'label' => '兑换积分余额',
+        ]
 //        'cf' => [
 //            'name' => 'cf',
 //            'label' => '车房养老奖余额',

+ 4 - 4
common/models/BalanceAudit.php

@@ -135,17 +135,17 @@ class BalanceAudit extends \common\components\ActiveRecord
             'UPDATE_ADMIN_ID' => [
                 'label' => '变更管理员',
                 'type' => function($data){
-                    $value = $data['value'];
+                    $value = is_array($data) && isset($data['value']) ? $data['value'] : '';
                     $result = Admin::findOneAsArray('ID=:ID', [':ID'=>$value], 'ADMIN_NAME');
-                    return $result['ADMIN_NAME'];
+                    return !empty($result) ? $result['ADMIN_NAME'] : '';
                 },
             ],
             'AUDIT_ADMIN_ID' => [
                 'label' => '审核管理员',
                 'type' => function($data){
-                    $value = $data['value'];
+                    $value = is_array($data) && isset($data['value']) ? $data['value'] : '';
                     $result = Admin::findOneAsArray('ID=:ID', [':ID'=>$value], 'ADMIN_NAME');
-                    return $result['ADMIN_NAME'];
+                    return !empty($result) ? $result['ADMIN_NAME'] : '';
                 },
             ],
             'CREATE_REMARK' => '备注',

+ 5 - 0
common/models/forms/ChangeBalanceForm.php

@@ -178,6 +178,11 @@ class ChangeBalanceForm extends Model {
     public function isStatus($attribute) {
         // 获取当前提现单的状态
         $oneData = BalanceAudit::findOneAsArray(['ID' => $this->id]);
+        if (empty($oneData) && empty($this->id) && !empty($this->selected)) {
+            if (is_array($this->selected) && count($this->selected) == 1) {
+                $oneData = BalanceAudit::findOneAsArray(['ID' => $this->selected[0]]);
+            }
+        }
         switch ($this->auditStatus) {
             case 'un':
                 $this->addError($attribute, '不能设置为待审核状态' . $this->auditStatus);