Merge branch 'feature/EK-4047'

# Conflicts:
#	backendApi/modules/v1/controllers/ShopController.php
#	backendApi/modules/v1/models/lists/shop/OrderList.php

backendApi/modules/v1/controllers/FinanceController.php

@@ -92,6 +92,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'];
         $params = $filter['params'];
@@ -136,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'];
@@ -299,6 +303,8 @@ class FinanceController extends BaseController {
             'CREATED_AT' => 'CREATED_AT',
             'PERIOD_NUM' => 'PERIOD_NUM',
             'REMARK' => 'REMARK',
+            //4047 国家筛选
+            'COUNTRY' => 'U.COUNTRY_ID',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
@@ -331,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'];
@@ -381,8 +389,14 @@ class FinanceController extends BaseController {
             'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
             'filterStatus' => 'W.AUDIT_STATUS',
             'CREATED_AT' => 'W.CREATED_AT',
+            'PAID_AT' => 'W.PAID_AT',
             'USER_NAME' => 'U.USER_NAME',
-            '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',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
@@ -496,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) {
@@ -1164,6 +1184,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'];
         $params = $filter['params'];
@@ -1217,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'];

backendApi/modules/v1/controllers/ShopController.php

@@ -310,7 +310,7 @@ class ShopController extends BaseController {
             'AMOUNT'=> 'DP.AMOUNT',
             'PV'=> 'DP.PV',
             'STATUS'=> 'DP.STATUS',
-			'STORE_NUMS'=>'DP.STORE_NUMS',
+            'STORE_NUMS'=>'DP.STORE_NUMS',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];
@@ -498,14 +498,14 @@ class ShopController extends BaseController {
             'COUNTRY' => 'O.COUNTRY_ID',
             'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
             'PAY_TYPE' => 'O.PAY_TYPE',
-            'CREATE_USER_NAME' => 'O.CREATE_USER_NAME',
-            'SKU_CODE' => 'O.SKU_CODE',
-            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+//            'CREATE_USER_NAME' => 'O.CREATE_USER',
+            'SKU_CODE' => 'OG.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
             'PAY_AT' => 'O.PAY_AT',
             'CONSIGNEE' => 'O.CONSIGNEE',
-            'GOODS_TITLE' => 'O.GOODS_TITLE',
+            'GOODS_TITLE' => 'OG.GOODS_TITLE',
             'CREATE_USER' => 'O.CREATE_USER',
-            'DEC_USER_NAME' => 'O.DEC_USER_NAME',
+            'DEC_USER_NAME' => 'O.DEC_USER_ID',
             'INVOICE_NO' => 'O.INVOICE_NO',
         ]);
 
@@ -549,14 +549,14 @@ class ShopController extends BaseController {
             'COUNTRY' => 'O.COUNTRY_ID',
             'AUTO_MAINTENANCE' => 'O.AUTO_MAINTENANCE',
             'PAY_TYPE' => 'O.PAY_TYPE',
-            'CREATE_USER_NAME' => 'O.CREATE_USER_NAME',
-            'SKU_CODE' => 'O.SKU_CODE',
-            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS_NAME',
+//            'CREATE_USER_NAME' => 'O.CREATE_USER',
+            'SKU_CODE' => 'OG.SKU_CODE',
+            'DELIVERY_STATUS_NAME' => 'O.DELIVERY_STATUS',
             'PAY_AT' => 'O.PAY_AT',
             'CONSIGNEE' => 'O.CONSIGNEE',
-            'GOODS_TITLE' => 'O.GOODS_TITLE',
+            'GOODS_TITLE' => 'OG.GOODS_TITLE',
             'CREATE_USER' => 'O.CREATE_USER',
-            'DEC_USER_NAME' => 'O.DEC_USER_NAME',
+            'DEC_USER_NAME' => 'O.DEC_USER_ID',
             'INVOICE_NO' => 'O.INVOICE_NO',
         ]);
 
@@ -1207,7 +1207,7 @@ class ShopController extends BaseController {
     {
         $prefix = 'Inv'.$country_code;
         $currentDate = date('dmY',$pay_at?:time());
-        
+
         // 查询今天生成的最新发票号（包含当天日期格式的）
         $order = Order::find()
             ->where(['STATUS' => 1, 'IS_DELETE' => 0])

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

@@ -260,8 +260,30 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 
                     'other' => 'date'
                 ], // 审核时间
+
+                //4047 (2026/3/24 16:54 Ryan)
+                'COUNTRY' => [
+                    'name' => Yii::t('ctx', 'country'),
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
             ];
         }
         return $this->filterTypes;
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }

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

@@ -111,6 +111,17 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     },
                     'headerOther' => ['width' => '190'],
                 ],
+                'PAY_DATE' => [
+                    'header' => \Yii::t('ctx', 'modelListFinancePaidAt'), // 申请时间
+                    'value' => function ($row) {
+                        return date('Y-m-d',$row['PAY_DATE'])."\t";
+                    },
+                    'headerOther' => ['width' => '190'],
+                ],
+                'RECHARGE_REMARK' => [
+                    'header' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnRechargeRemark'), // 会员备注
+                    'headerOther' => ['width' => '190'],
+                ],
                 'REMARK' => [
                     'header' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnRemark'), // 备注
                     'headerOther' => [
@@ -152,8 +163,30 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                 'BANK_NO' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnBankNo')],// 汇款账号
                 'AMOUNT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnAmount')],// 充值金额
                 'CREATED_AT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnCreatedAt'), 'other' => 'date'],// 申请时间
+                'PAY_DATE' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinancePaidAt'), 'other' => 'date'],// 申请时间
+                //4047 (2026/3/24 16:54 Ryan)
+                'COUNTRY_NAME' => [
+                    'name' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListCountryName'), // 国家
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
             ];
         }
         return $this->filterTypes;
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }

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

@@ -209,8 +209,30 @@ class TransferList extends \common\libs\dataList\DataList implements DataListInt
                 'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceTranserListCreatedAt'), 'other' => 'date'],
                 'PERIOD_NUM' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceTranserListPeriodNum')],
                 'REMARK' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')],
+                //4047 (2026/3/24 16:54 Ryan)
+
+                'COUNTRY' => [
+                    'name' => Yii::t('ctx', 'country'),
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
             ];
         }
         return $this->filterTypes;
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }

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

@@ -74,6 +74,15 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     },
                     'headerOther' => ['width' => '190'],
                 ],
+                'PAID_AT' => [
+                    'header' => \Yii::t('ctx', 'modelListFinancePaidAt'), // 提现时间
+                    'value' => function ($row) {
+                        return (new DateTime([
+                            'value' => $row['PAID_AT'],
+                        ]))->result();
+                    },
+                    'headerOther' => ['width' => '190'],
+                ],
                 'AUDIT_STATUS' => null,
                 'AUDIT_STATUS_NAME' => [
                     'header' => \Yii::t('ctx', 'modelListFinanceWithdrawState'), // 提现状态
@@ -166,10 +175,53 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                 'SN' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawSn')], // 提现流水号
                 'USER_NAME' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListUserName')], // 会员编号
                 'WITHDRAW_PERIOD_NUM' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawPeriod')], // 提现期数
-                'CREATED_AT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawWithdrawalTime'), 'other' => 'date'],  // 申请时间
-                'REAL_AMOUNT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawRealAmount')] // 实际到账金额
+                'CREATED_AT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawAt'), 'other' => 'date'],  // 申请时间
+                'PAID_AT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinancePaidAt'), 'other' => 'date'],  // 付款时间
+                'REAL_AMOUNT' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawRealAmount')], // 实际到账金额
+
+                'USER_REAL_NAME' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListRealName')],
+                'COUNTRY_NAME' => [
+                    'name'=> \Yii::t('ctx', 'modelListFinanceBalanceAuditListCountryName'),
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
+                'OPEN_BANK' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawBank'),
+                    'other'=> 'select',
+                    'selectData'=> self::getAllOpenBank()],
+                'MOBILE' => ['isUserTable' => false, 'name' => \Yii::t('ctx', 'modelListFinanceWithdrawMobile')],
             ];
         }
         return $this->filterTypes;
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
+
+    public function getAllOpenBank()
+    {
+
+        $banks =  OpenBank::find()->where('1=1')->indexBy('BANK_CODE')->orderBy('CREATED_AT ASC')->asArray()->all();
+
+        $data = [];
+        foreach ($banks as $bank) {
+            $data[] = [
+                'id' => $bank['ID'],
+                'name' => $bank['BANK_NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }

backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -435,9 +435,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                     'other'=> 'select',
                     'selectData'=>self::getpayTypes()
                 ],
-                'CREATE_USER_NAME' => [
-                    'name' => \Yii::t('ctx', 'shopOrderListCreatorName'), // 创建人姓名
-                ],
+//                'CREATE_USER_NAME' => [
+//                    'name' => \Yii::t('ctx', 'shopOrderListCreatorName'), // 创建人姓名
+//                ],
                 'SKU_CODE' => [
                     'name' => \Yii::t('ctx', 'shopOrderListProductCode'), // 存货编码
                 ],
@@ -457,9 +457,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 'CONSIGNEE' => [
                     'name' => \Yii::t('ctx', 'shopOrderListRecipient'), // 收货人
                 ],
-                'GOODS_TITLE' => [
-                    'name' => \Yii::t('ctx', 'shopOrderListProductName'), // 存货名称
-                ],
+//                'GOODS_TITLE' => [
+//                    'name' => \Yii::t('ctx', 'shopOrderListProductName'), // 存货名称
+//                ],
                 'CREATE_USER' => [
                     'name' => \Yii::t('ctx', 'shopOrderListCreatorNo'), // 创建人编号
                 ],

common/libs/export/BaseExport.php

@@ -353,6 +353,7 @@ class BaseExport extends Component {
                     'CREATE_USER' => $columnData['CREATE_USER'],
                     'CREATE_USER_NAME' => $createUserName,
                     'SN' => $columnData['SN'],
+                    'INVOICE_NO' => $columnData['INVOICE_NO'],
                     'STATUS' => Tool::paramConvert(\Yii::$app->params['orderStatus'])[$columnData['STATUS']]['label'] ?? '',
                     'SKU_CODE' => $columnData['SKU_CODE'],
                     'GOODS_TITLE' => Tool::mbSignConvert($columnData['GOODS_TITLE']) ,
@@ -1582,6 +1583,7 @@ ORDER;
 
         // 添加详细的调试信息
         $rawSql = $query->createCommand()->getRawSql();
+//        echo('sql:' . $rawSql);
         $oderList = $query->all();
 
         $sn = $oderList[0]['SN'];

common/messages/en-US/ctx.php

@@ -64,6 +64,7 @@ return [
     'modelListFinanceWithdrawSn'=>'Withdrawal serial number',
     'modelListFinanceWithdrawPeriod'=>'Period',
     'modelListFinanceWithdrawAt'=>'Withdrawal time',
+    'modelListFinancePaidAt'=>'Paid time',
     'modelListFinanceWithdrawState'=>'State',
     'modelListFinanceWithdrawAmount'=>'Withdrawal amount',
     'modelListFinanceWithdrawFees' => 'Bank charge',
@@ -80,7 +81,8 @@ return [
     'modelsListsFinanceRechargeListgetColumnAuditStatus' => 'Audit Status',
     'modelsListsFinanceRechargeListgetColumnAmount' => 'Recharge amount',
     'modelsListsFinanceRechargeListgetColumnCreatedAt' => 'Apply time',
-    'modelsListsFinanceRechargeListgetColumnRemark' => 'Remark',
+    'modelsListsFinanceRechargeListgetColumnRemark' => 'Approval Remark',
+    'modelsListsFinanceRechargeListgetColumnRechargeRemark' => 'Remark',
     'modelsListsFinanceRechargeListgetColumnType' => 'Type',
     'rechargeRecordSerialNumber'=>'Recharge record serial number',
     'rechargeAuditStatusToBeReviewed'=>'To be reviewed',
@@ -876,6 +878,7 @@ return [
     'shopFlowTypeIncrease' => 'Increase',
     'shopFlowTypeOther' => 'Other',
     'shopFlowTypeAdministratorManualAdjustment' => 'Administrator manual adjustment',
+    'taxInvoice' => 'Tax Invoice',
     # 国家
     'dbCountriesdz' => "COTE D'IVOIRE",
     'dbCountriesao' => 'ALGERIA',

common/messages/zh-CN/ctx.php

@@ -64,6 +64,7 @@ return [
     'modelListFinanceWithdrawSn'=>'提现流水号',
     'modelListFinanceWithdrawPeriod'=>'提现期数',
     'modelListFinanceWithdrawAt'=>'提现时间',
+    'modelListFinancePaidAt'=>'付款时间',
     'modelListFinanceWithdrawState'=>'提现状态',
     'modelListFinanceWithdrawAmount'=>'提现金额',
     'modelListFinanceWithdrawFees' => '手续费',
@@ -80,7 +81,8 @@ return [
     'modelsListsFinanceRechargeListgetColumnAuditStatus' => '审核状态',
     'modelsListsFinanceRechargeListgetColumnAmount' => '充值金额',
     'modelsListsFinanceRechargeListgetColumnCreatedAt' => '申请时间',
-    'modelsListsFinanceRechargeListgetColumnRemark' => '备注',
+    'modelsListsFinanceRechargeListgetColumnRemark' => '审批备注',
+    'modelsListsFinanceRechargeListgetColumnRechargeRemark' => '备注',
     'modelsListsFinanceRechargeListgetColumnType' => '类型',
     'rechargeRecordSerialNumber'=>'充值记录流水号',
     'rechargeAuditStatusToBeReviewed'=>'待审核',
@@ -881,6 +883,7 @@ return [
     'shopFlowTypeOther' => '其它',
     'shopFlowTypeAdministratorManualAdjustment' => '管理员手动调整',
 
+    'taxInvoice' => '发票',
     # 国家
     'dbCountriesdz' => "COTE D'IVOIRE",
     'dbCountriesao' => 'ALGERIA',