Merge branch 'feature/2049-withdraw-filter', remote-tracking branch 'origin' into develop

backendApi/modules/v1/controllers/FinanceController.php

@@ -324,11 +324,12 @@ class FinanceController extends BaseController {
         $filter = $this->filterCondition([
             'SN' => 'W.SN',
             'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
-            'ID_CARD' => 'W.ID_CARD',
+//            'ID_CARD' => 'W.ID_CARD',
             'filterStatus' => 'W.AUDIT_STATUS',
             'CREATED_AT' => 'W.CREATED_AT',
             //'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
+            'REAL_AMOUNT' => 'W.REAL_AMOUNT'
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
@@ -452,6 +453,7 @@ class FinanceController extends BaseController {
             'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
             'USER_NAME' => 'U.USER_NAME',
             'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
+            'REAL_AMOUNT' => 'W.REAL_AMOUNT'
         ]);
 //        $selectedIds = \Yii::$app->request->get('selectedIds', []);
 //        if ($selectedIds) {

backendApi/modules/v1/models/lists/finance/WithdrawList.php

@@ -194,6 +194,7 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
 //                'ID_CARD' => ['isUserTable' => false, 'name' => '身份证号'],
                 //'AUDIT_STATUS_NAME' => ['isUserTable' => false, 'name' => '审核状态', 'other' => 'select', 'selectData' => [['id' =>0, 'name' => '提现待审核'], ['id' => 2, 'name' => '提现已审核'], ['id' => 3, 'name' => '提现待付款'], ['id' => 4, 'name' => '付款失败'], ['id' => 5, 'name' => '已拒绝'], ['id' => 6, 'name' => '提现已付款'], ['id' => 7, 'name' => '已退回']]],
                 'CREATED_AT' => ['isUserTable' => false, 'name' => 'Withdrawal time', 'other' => 'date'],  // 申请时间
+                'REAL_AMOUNT' => ['isUserTable' => false, 'name' => 'Actual Amount']
             ];
         }
         return $this->filterTypes;