feature/EK-4047

backendApi/modules/v1/controllers/FinanceController.php

@@ -138,6 +138,8 @@ class FinanceController extends BaseController {
             'AUDITED_AT' => 'BA.AUDITED_AT',
             'CREATE_ADMIN_NAME' => 'ADMC.ADMIN_NAME',
             'AUDIT_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
+            //4047 国家筛选
+            'COUNTRY' => 'U.COUNTRY_ID',
         ]);
 
         $condition = $filter['condition'];
@@ -335,20 +337,22 @@ class FinanceController extends BaseController {
             'LAST_OUT_USER_NAME' => 'LAST_OUT_USER_NAME',
             'LAST_OUT_REAL_NAME' => 'LAST_OUT_REAL_NAME',
             'LAST_OUT_DEC_LV_NAME' => 'LAST_OUT_DEC_LV',
-            'LAST_OUT_DEC_ROLE_NAME' => 'LAST_OUT_DEC_ROLE_ID',
-            'OUT_WALLET' => 'OUT_WALLET',
-            'LAST_OUT_SYSTEM_NAME' => 'LAST_OUT_SYSTEM_ID',
+//            'LAST_OUT_DEC_ROLE_NAME' => 'LAST_OUT_DEC_ROLE_ID',
+//            'OUT_WALLET' => 'OUT_WALLET',
+//            'LAST_OUT_SYSTEM_NAME' => 'LAST_OUT_SYSTEM_ID',
             'LAST_IN_USER_NAME' => 'LAST_IN_USER_NAME',
             'LAST_IN_REAL_NAME' => 'LAST_IN_REAL_NAME',
             'LAST_IN_DEC_LV_NAME' => 'LAST_IN_DEC_LV',
-            'IN_WALLET' => 'IN_WALLET',
-            'LAST_IN_SYSTEM_NAME' => 'LAST_IN_SYSTEM_ID',
+//            'IN_WALLET' => 'IN_WALLET',
+//            'LAST_IN_SYSTEM_NAME' => 'LAST_IN_SYSTEM_ID',
             'ORI_AMOUNT' => 'ORI_AMOUNT',
             'FEE' => 'FEE',
             'AMOUNT' => 'AMOUNT',
             'CREATED_AT' => 'CREATED_AT',
             'PERIOD_NUM' => 'PERIOD_NUM',
             'REMARK' => 'REMARK',
+            //4047 国家筛选
+            'COUNTRY' => 'U.COUNTRY_ID',
         ]);
 
         $condition = $filter['condition'];
@@ -506,11 +510,17 @@ class FinanceController extends BaseController {
     public function actionWithdrawExport() {
         $filter = $this->filterCondition([
             'SN' => 'W.SN',
+            'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
+            'filterStatus' => 'W.AUDIT_STATUS',
             'CREATED_AT' => 'W.CREATED_AT',
-            'AUDIT_STATUS_NAME' => 'W.AUDIT_STATUS',
+            'PAID_AT' => 'W.PAID_AT',
             'USER_NAME' => 'U.USER_NAME',
-            'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
-            'REAL_AMOUNT' => 'W.REAL_AMOUNT'
+            'REAL_AMOUNT' => 'W.REAL_AMOUNT',
+            //4047新增 “会员姓名”、“国家”、“提现银行”、“手机号"
+            'USER_REAL_NAME' => 'U.REAL_NAME',
+            'COUNTRY_NAME' => 'U.COUNTRY_ID',
+            'OPEN_BANK' => 'U.OPEN_BANK',
+            'MOBILE' => 'U.MOBILE',
         ]);
 //        $selectedIds = \Yii::$app->request->get('selectedIds', []);
 //        if ($selectedIds) {
@@ -1230,6 +1240,9 @@ class FinanceController extends BaseController {
             'AUDIT_STATUS' => 'R.AUDIT_STATUS',
             'BANK_NO' => 'R.BANK_NO',
             'CREATED_AT' => 'R.CREATED_AT',
+            'PAY_DATE' => 'R.PAY_DATE',
+            //4047 国家筛选
+            'COUNTRY_NAME' => 'U.COUNTRY_ID',
         ]);
 
         $condition = $filter['condition'];