feature/EK-3322

common/models/Recharge.php

@@ -33,6 +33,7 @@ use Yii;
  * @property string $AUDIT_ADMIN 审核管理员
  * @property int $CREATED_AT 创建时间
  * @property int $AUDITED_AT 审核时间
+ * @property string $TYPE 支付方式
  */
 class Recharge extends \common\components\ActiveRecord {
     const TYPE_MANUAL = 0;      // 手动充值
@@ -86,6 +87,8 @@ class Recharge extends \common\components\ActiveRecord {
             [['REMARK'], 'string', 'max' => 4000],
             [['ID'], 'unique'],
             [['SN'], 'unique'],
+            ['rechargeType', 'string', 'max' => 50], // 限制长度
+            ['rechargeType', 'in', 'range' => ['Cash', 'Credit Card', 'Direct Banking']],
         ];
     }
 
@@ -117,6 +120,7 @@ class Recharge extends \common\components\ActiveRecord {
             'AUDIT_ADMIN' => '审核管理员',
             'CREATED_AT' => '创建时间',
             'AUDITED_AT' => '审核时间',
+            'TYPE' => '支付方式',
         ];
     }
 

common/models/forms/RechargeForm.php

@@ -38,13 +38,14 @@ class RechargeForm extends Model {
     private $_userId;
 
     public $id;
+    public $rechargeType;
 
     /**
      * @inheritdoc
      */
     public function rules() {
         return [
-            [['userName', 'idCard', 'applyAmount', 'auditStatus', 'remark', 'selectedIds', 'sn','amount', 'bankRealName', 'bankNo'], 'trim'],
+            [['userName', 'idCard', 'applyAmount', 'auditStatus', 'remark', 'selectedIds', 'sn','amount', 'bankRealName', 'bankNo','rechargeType'], 'trim'],
             [['selectedIds', 'auditStatus', 'userName','applyAmount','openBank','bankNo'/*,'bankAddress'*/], 'required'],
             [['selectedIds'], 'exist', 'targetClass' => Recharge::class, 'targetAttribute' => 'ID', 'message' => 'Recharge does not exist'], // 充值申请不存在
             [['userName'], 'exist', 'targetClass' => UserInfo::class, 'targetAttribute' => 'USER_NAME', 'message' => 'Member does not exist'],// 会员不存在
@@ -53,6 +54,8 @@ class RechargeForm extends Model {
             [['applyAmount'], 'number', 'max' => 10000000000, 'min' => 1],
             [['selectedIds'], 'isSelected'],
             [['id'], 'number'],
+            ['rechargeType', 'string', 'max' => 50], // 限制长度
+            ['rechargeType', 'in', 'range' => ['Cash', 'Credit Card', 'Direct Banking']],
             //[['sn'], 'isSn'],
         ];
     }
@@ -211,6 +214,7 @@ class RechargeForm extends Model {
             $rechargeModel->OPEN_BANK = $this->openBank;
             $rechargeModel->BANK_ADDRESS = $this->bankAddress;
             $rechargeModel->BANK_NO = $this->bankNo;
+            $rechargeModel->TYPE = $this->rechargeType;
 //            $rechargeModel->BANK_PROVINCE = $this->bankProvince ?? 0;
 //            $rechargeModel->BANK_CITY = $this->bankCity ?? 0;
 //            $rechargeModel->BANK_COUNTY = $this->bankCounty ?? 0;
@@ -268,6 +272,7 @@ class RechargeForm extends Model {
             $rechargeLogModel->UPDATE_BANK_NO = $this->bankNo;
             $rechargeLogModel->P_MONTH = $rechargeModel->P_MONTH;
             $rechargeLogModel->AUDIT_STATUS = $rechargeModel->AUDIT_STATUS;
+            $rechargeLogModel->TYPE = $rechargeModel->TYPE;
             $rechargeLogModel->CREATED_AT = $nowTime;
             if (!$rechargeLogModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeLogModel->getErrors()));
@@ -278,6 +283,7 @@ class RechargeForm extends Model {
             $rechargeModel->BANK_ADDRESS = $this->bankAddress;
             $rechargeModel->BANK_NO = $this->bankNo;
             $rechargeModel->UPDATED_AT = $nowTime;
+            $rechargeModel->TYPE = $this->rechargeType;
             if (!$rechargeModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeModel->getErrors()));
             }