Merge branch 'feature/EK-4046' of guanli/ngds into master

common/models/Recharge.php

@@ -34,6 +34,8 @@ use Yii;
  * @property int $CREATED_AT 创建时间
  * @property int $AUDITED_AT 审核时间
  * @property string $TYPE 支付方式
+ * @property int $PAY_DATE 4046:支付时间
+ * @property string $RECHARGE_REMARK 4046备注,用户后台添加时的备注
  */
 class Recharge extends \common\components\ActiveRecord {
     const TYPE_MANUAL = 0;      // 手动充值
@@ -78,13 +80,13 @@ class Recharge extends \common\components\ActiveRecord {
      */
     public function rules() {
         return [
-            [['USER_ID', 'P_MONTH', 'CREATED_AT'], 'required'],
-            [['RECHARGE_PERIOD_NUM', 'RECHARGE_YEAR', 'RECHARGE_MONTH', 'AUDIT_STATUS', 'CREATED_AT', 'AUDITED_AT', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY'], 'integer'],
+            [['USER_ID', 'P_MONTH', 'CREATED_AT','PAY_DATE','RECHARGE_REMARK'], 'required'],
+            [['RECHARGE_PERIOD_NUM', 'RECHARGE_YEAR', 'RECHARGE_MONTH', 'AUDIT_STATUS', 'CREATED_AT','PAY_DATE', 'AUDITED_AT', 'BANK_PROVINCE', 'BANK_CITY', 'BANK_COUNTY'], 'integer'],
             [['AMOUNT'], 'number'],
             [['ID', 'SN', 'USER_ID', 'OPEN_BANK', 'BANK_NO', 'AUDIT_ADMIN'], 'string', 'max' => 32],
             [['ID_CARD'], 'string', 'max' => 20],
             [['REAL_NAME', 'BANK_ADDRESS'], 'string', 'max' => 255],
-            [['REMARK'], 'string', 'max' => 4000],
+            [['REMARK','RECHARGE_REMARK'], 'string', 'max' => 4000],
             [['ID'], 'unique'],
             [['SN'], 'unique'],
             ['TYPE', 'string', 'max' => 50], // 限制长度
@@ -121,6 +123,8 @@ class Recharge extends \common\components\ActiveRecord {
             'CREATED_AT' => '创建时间',
             'AUDITED_AT' => '审核时间',
             'TYPE' => '支付方式',
+            'PAY_DATE' => '支付时间',
+            'RECHARGE_REMARK' => '备注',
         ];
     }
 

common/models/forms/RechargeForm.php

@@ -39,14 +39,16 @@ class RechargeForm extends Model {
 
     public $id;
     public $rechargeType;
+    public $payDate;
+    public $rechargeRemark;
 
     /**
      * @inheritdoc
      */
     public function rules() {
         return [
-            [['userName', 'idCard', 'applyAmount', 'auditStatus', 'remark', 'selectedIds', 'sn','amount', 'bankRealName', 'bankNo','rechargeType'], 'trim'],
-            [['selectedIds', 'auditStatus', 'userName','applyAmount','openBank','bankNo'/*,'bankAddress'*/], 'required'],
+            [['userName', 'idCard', 'applyAmount', 'auditStatus', 'remark', 'selectedIds', 'sn','amount', 'bankRealName', 'bankNo','rechargeType','payDate','rechargeRemark'], 'trim'],
+            [['selectedIds', 'auditStatus', 'userName','applyAmount','payDate','rechargeRemark',/*'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'],// 会员不存在
             [['applyAmount'], 'price'],
@@ -68,8 +70,8 @@ class RechargeForm extends Model {
         $parentScenarios = parent::scenarios();
         $customScenarios = [
             'addByAdmin' => ['userName', 'applyAmount'],
-            'addByUser' => ['applyAmount','openBank','bankNo','bankAddress','rechargeType'/*,'currency'*/],
-            'updateByUser' => ['id','applyAmount','openBank','bankNo','bankAddress','rechargeType'/*,'currency'*/],
+            'addByUser' => ['applyAmount','openBank','bankNo','bankAddress','rechargeType','payDate','rechargeRemark'/*,'currency'*/],
+            'updateByUser' => ['id','applyAmount','openBank','bankNo','bankAddress','rechargeType','payDate','rechargeRemark'/*,'currency'*/],
             'statusByAdmin' => ['selectedIds', 'auditStatus', 'createRemark'],
             'updateByAdmin' => ['id', 'rechargeType'],
         ];
@@ -222,6 +224,8 @@ class RechargeForm extends Model {
             $rechargeModel->P_MONTH = Date::ociToDate($period['yearMonth'], Date::OCI_TIME_FORMAT_SHORT_MONTH);
             $rechargeModel->AUDIT_STATUS = Recharge::STATUS_APPLIED;
             $rechargeModel->CREATED_AT = $nowTime;
+            $rechargeModel->PAY_DATE = strtotime($this->payDate);
+            $rechargeModel->RECHARGE_REMARK = $this->rechargeRemark;
             if (!$rechargeModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeModel->getErrors()));
             }
@@ -275,6 +279,8 @@ class RechargeForm extends Model {
             $rechargeLogModel->AUDIT_STATUS = $rechargeModel->AUDIT_STATUS;
             $rechargeLogModel->TYPE = $rechargeModel->TYPE;
             $rechargeLogModel->CREATED_AT = $nowTime;
+            $rechargeLogModel->PAY_DATE = strtotime($rechargeModel->PAY_DATE);
+            $rechargeLogModel->RECHARGE_REMARK = $rechargeModel->RECHARGE_REMARK;
             if (!$rechargeLogModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeLogModel->getErrors()));
             }
@@ -285,6 +291,8 @@ class RechargeForm extends Model {
             $rechargeModel->BANK_NO = $this->bankNo;
 //            $rechargeModel->UPDATED_AT = $nowTime;
             $rechargeModel->TYPE = $this->rechargeType;
+            $rechargeModel->PAY_DATE = strtotime($this->payDate);
+            $rechargeModel->RECHARGE_REMARK = $this->rechargeRemark;
             if (!$rechargeModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeModel->getErrors()));
             }
@@ -338,6 +346,8 @@ class RechargeForm extends Model {
             $rechargeLogModel->AUDIT_STATUS = $rechargeModel->AUDIT_STATUS;
             $rechargeLogModel->TYPE = $rechargeModel->TYPE;
             $rechargeLogModel->CREATED_AT = $nowTime;
+            $rechargeLogModel->PAY_DATE = strtotime($rechargeModel->PAY_DATE);
+            $rechargeLogModel->RECHARGE_REMARK = $rechargeModel->RECHARGE_REMARK;
             if (!$rechargeLogModel->save()) {
                 throw new Exception(Form::formatErrorsForApi($rechargeLogModel->getErrors()));
             }

frontendApi/modules/v1/controllers/FinanceController.php

@@ -537,6 +537,7 @@ class FinanceController extends BaseController {
             //$data['list'][$key]['BANK_CITY_NAME'] = $value['BANK_CITY'] ? Region::getCnName($value['BANK_CITY']) : '';
             //$data['list'][$key]['BANK_COUNTY_NAME'] = $value['BANK_COUNTY'] ? Region::getCnName($value['BANK_COUNTY']) : '';
             $data['list'][$key]['STATUS_NAME'] = Recharge::getRechargeStatus()[$value['AUDIT_STATUS']];
+            $data['list'][$key]['PAY_DATE'] = date('Y-m-d', $value['PAY_DATE']);
         }
         return static::notice($data);
     }