feat: NC-43: 余额流水显示的备注不正确.

common/models/BalanceAudit.php

@@ -148,9 +148,9 @@ class BalanceAudit extends \common\components\ActiveRecord
                     return !empty($result) ? $result['ADMIN_NAME'] : '';
                 },
             ],
-            'CREATE_REMARK' => '备注',
+            'CREATE_REMARK' => '创建备注',
             'REMARK_IS_SHOW' => [
-                'label' => '前台是否显示备注',
+                'label' => '前台是否显示创建备注',
                 'type' => ValueTypeConfig::YES_NO_TYPE,
             ],
             'CREATED_AT' => [
@@ -161,6 +161,7 @@ class BalanceAudit extends \common\components\ActiveRecord
                 'label' => '审核时间',
                 'type' => ValueTypeConfig::DATE_TIME_TYPE,
             ],
+            'AUDIT_REMARK' => '审核备注',
         ];
     }
 }

common/models/forms/ChangeBalanceForm.php

@@ -362,7 +362,7 @@ class ChangeBalanceForm extends Model {
             $model->DEAL_TYPE = $this->dealType;
             $model->AMOUNT = $this->amount;
             $model->REMARK_IS_SHOW = $this->isShow;
-            $model->CREATE_REMARK = $this->remark;
+            $model->AUDIT_REMARK = $this->remark;
             $model->AUDITED_AT = Date::nowTime();
             if (!$model->save()) {
                 throw new Exception(Form::formatErrorsForApi($model->getErrors()));
@@ -370,7 +370,7 @@ class ChangeBalanceForm extends Model {
             // 如果是审核通过状态
             if ($this->auditStatus == 'true') {
                 if($model->TYPE=='cash') {
-                    Cash::changeUserCash($model->USER_ID, 'CASH', $model->AMOUNT, ['REMARK' => '后台管理员充值']);
+                    Cash::changeUserCash($model->USER_ID, 'CASH', $model->AMOUNT, ['REMARK' => $this->remark ?? '后台管理员充值']);
                 }else{
                     Balance::changeUserBonus($model->USER_ID, $model->TYPE, $model->AMOUNT, ['REMARK' => $model->CREATE_REMARK, 'REMARK_IS_SHOW' => $model->REMARK_IS_SHOW, 'DEAL_TYPE_ID' => $model->DEAL_TYPE, 'DEAL_TYPE_IS_PRESET' => 0, 'ADMIN_NAME' => Admin::getAdminNameById(\Yii::$app->user->id)]);
                 }
@@ -433,7 +433,7 @@ class ChangeBalanceForm extends Model {
                 $model = BalanceAudit::findOne(['ID' => $select]);
                 $model->AUDIT_STATUS = \Yii::$app->params['auditStatus'][$this->auditStatus]['value'];
                 $model->AUDIT_ADMIN_ID = \Yii::$app->user->id;
-                $model->CREATE_REMARK = $this->remark;
+                $model->AUDIT_REMARK = $this->remark;
                 $model->AUDITED_AT = Date::nowTime();
                 if (!$model->save()) {
                     throw new Exception(Form::formatErrorsForApi($model->getErrors()));