feat: NG-71: 会员余额调整修改

backendApi/modules/v1/controllers/FinanceController.php

@@ -323,10 +323,8 @@ class FinanceController extends BaseController {
         $filter = $this->filterCondition([
             'SN' => 'W.SN',
             'WITHDRAW_PERIOD_NUM' => 'W.WITHDRAW_PERIOD_NUM',
-//            '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'
         ]);
@@ -334,25 +332,7 @@ class FinanceController extends BaseController {
         $params = $filter['params'];
         $listObj = new WithdrawList();
         $data = $listObj->getList(['condition' => $condition, 'params' => $params]);
-//        $data = Withdraw::lists($condition, $params, [
-//            'select' => 'W.*,UI.REG_TYPE,IA.AMOUNT INVOICE_AMOUNT,IA.INVOICE_NUM,ADM.ADMIN_NAME UPDATE_ADMIN_NAME,ADMA.ADMIN_NAME AUDIT_ADMIN_NAME',
-//            'orderBy' => 'W.CREATED_AT DESC',
-//            'from' => Withdraw::tableName() . ' AS W',
-//            'join' => [
-//                ['LEFT JOIN', UserInfo::tableName() . ' AS UI', 'W.USER_ID=UI.USER_ID'],
-//                ['LEFT JOIN', InvoiceAudit::tableName() . ' AS IA', 'W.ID=IA.WITHDRAW_ID'],
-//                ['LEFT JOIN', Admin::tableName() . ' AS ADM', 'ADM.ID=W.UPDATE_ADMIN'],
-//                ['LEFT JOIN', Admin::tableName() . ' AS ADMA', 'ADMA.ID=W.AUDIT_ADMIN'],
-//            ],
-//        ]);
-//        $auditStatus = Withdraw::STATUS_NAME;
-//        foreach ($data['list'] as $key => $value) {
-//            //$baseInfo = Info::baseInfoWithNet($value['USER_ID']);
-//            $baseInfo = User::findOneAsArray('ID=:ID', [':ID'=>$value['USER_ID']]);
-//            $data['list'][$key]['BASE_INFO'] = $baseInfo;
-//            $data['list'][$key]['AUDIT_STATUS_NAME'] = $auditStatus[$value['AUDIT_STATUS']];
-//            $data['list'][$key]['BANK_INFO'] = Withdraw::getBankInfo($value, $baseInfo);
-//        }
+
         return static::notice($data);
     }
 

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

@@ -7,8 +7,10 @@ use common\helpers\Audit;
 use common\helpers\Tool;
 use common\libs\dataList\column\DateTime;
 use common\libs\dataList\DataListInterface;
+use common\models\Countries;
 use common\models\OpenBank;
 use common\models\Recharge;
+use common\models\User;
 use common\models\UserInfo;
 
 class RechargeList extends \common\libs\dataList\DataList implements DataListInterface {
@@ -25,13 +27,15 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
      */
     public function dataHandle() {
         $this->listData = Recharge::lists($this->condition, $this->params, [
-            'select' => 'R.*,UI.USER_NAME,OB.BANK_NAME OPEN_BANK_NAME,ADMA.ADMIN_NAME AUDIT_ADMIN_NAME',
+            'select' => 'R.*,UI.USER_NAME,OB.BANK_NAME OPEN_BANK_NAME,ADMA.ADMIN_NAME AUDIT_ADMIN_NAME,CN.NAME COUNTRY_NAME',
             'orderBy' => 'R.CREATED_AT DESC, R.ID DESC',
             'from' => Recharge::tableName() . ' AS R',
             'join' => [
                 ['LEFT JOIN', UserInfo::tableName() . ' AS UI', 'UI.USER_ID=R.USER_ID'],
+                ['LEFT JOIN', USER::tableName() . ' AS U', 'U.ID=R.USER_ID'],
                 ['LEFT JOIN', OpenBank::tableName() . ' AS OB', 'OB.BANK_CODE=R.OPEN_BANK'],
                 ['LEFT JOIN', Admin::tableName() . ' AS ADMA', 'ADMA.ID=R.AUDIT_ADMIN'],
+                ['LEFT JOIN', Countries::tableName() . ' AS CN', 'U.COUNTRY_ID=CN.ID'],
             ],
             'page' => $this->page,
             'pageSize' => $this->pageSize,
@@ -61,6 +65,10 @@ class RechargeList extends \common\libs\dataList\DataList implements DataListInt
                     'header' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListUserName'), // 会员编号
                     'headerOther' => ['width' => '150'],
                 ],
+                'COUNTRY_NAME' => [
+                    'header' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListCountryName'), // 国家
+                    'headerOther' => ['width' => '150'],
+                ],
                 'OPEN_BANK_NAME' => [
                     'header' => \Yii::t('ctx', 'modelsListsFinanceRechargeListgetColumnBank'), // 汇款银行
                     'headerOther' => ['width' => '150'],

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

@@ -8,6 +8,7 @@ use common\helpers\Cache;
 use common\helpers\Tool;
 use common\libs\dataList\column\DateTime;
 use common\libs\dataList\DataListInterface;
+use common\models\Countries;
 use common\models\OpenBank;
 use common\models\User;
 use common\models\Withdraw;
@@ -26,13 +27,14 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
      */
     public function dataHandle() {
         $this->listData = Withdraw::lists($this->condition, $this->params, [
-            'select' => 'W.*,U.USER_NAME,U.REAL_NAME AS USER_REAL_NAME,U.ID_CARD,U.MOBILE,U.OPEN_BANK,U.BANK_PROVINCE,U.BANK_CITY,U.BANK_COUNTY,U.BANK_ADDRESS,U.BANK_NO,ADM.ADMIN_NAME UPDATE_ADMIN_NAME,ADMA.ADMIN_NAME AUDIT_ADMIN_NAME',
+            'select' => 'W.*,U.USER_NAME,U.REAL_NAME AS USER_REAL_NAME,U.ID_CARD,U.MOBILE,U.OPEN_BANK,U.BANK_PROVINCE,U.BANK_CITY,U.BANK_COUNTY,U.BANK_ADDRESS,U.BANK_NO,ADM.ADMIN_NAME UPDATE_ADMIN_NAME,ADMA.ADMIN_NAME AUDIT_ADMIN_NAME,CN.NAME COUNTRY_NAME',
             'orderBy' => 'W.CREATED_AT DESC',
             'from' => Withdraw::tableName() . ' AS W',
             'join' => [
                 ['LEFT JOIN', User::tableName() . ' AS U', 'W.USER_ID=U.ID'],
                 ['LEFT JOIN', Admin::tableName() . ' AS ADM', 'ADM.ID=W.UPDATE_ADMIN'],
                 ['LEFT JOIN', Admin::tableName() . ' AS ADMA', 'ADMA.ID=W.AUDIT_ADMIN'],
+                ['LEFT JOIN', Countries::tableName() . ' AS CN', 'U.COUNTRY_ID=CN.ID'],
             ],
             'page' => $this->page,
             'pageSize' => $this->pageSize,
@@ -89,6 +91,10 @@ class WithdrawList extends \common\libs\dataList\DataList implements DataListInt
                     'header' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListRealName'), // 会员姓名
                     'headerOther' => ['width' => '150'],
                 ],
+                'COUNTRY_NAME' => [
+                    'header' => \Yii::t('ctx', 'modelListFinanceBalanceAuditListCountryName'), // 国家
+                    'headerOther' => ['width' => '150'],
+                ],
                 'AMOUNT' => [
                     'header' => \Yii::t('ctx', 'modelListFinanceWithdrawAmount'), // 提现金额
                     'value' => function ($row) {

common/messages/en-US/ctx.php

@@ -31,6 +31,7 @@ return [
     'backendApiControllersFinaceRechargeStatusApprove' => 'Approve',
     'backendApiControllersFinaceRechargeStatusReject' => 'Reject',
     'modelListFinanceBalanceAuditListUserName' => 'Member Code',
+    'modelListFinanceBalanceAuditListCountryName' => 'Country',
     'modelListFinanceBalanceAuditListRealName'=>'Member Name',
     'modelListFinanceBalanceAuditListMemberLevel'=> 'Member level',
     'modelListFinanceBalanceAuditListStockistLevel'=> 'Stockist level',

common/messages/zh-CN/ctx.php

@@ -31,6 +31,7 @@ return [
     'backendApiControllersFinaceRechargeStatusApprove' => '审核通过',
     'backendApiControllersFinaceRechargeStatusReject' => '审核拒绝',
     'modelListFinanceBalanceAuditListUserName' => '会员编号',
+    'modelListFinanceBalanceAuditListCountryName' => '国家',
     'modelListFinanceBalanceAuditListRealName'=>'会员姓名',
     'modelListFinanceBalanceAuditListMemberLevel'=> '会员报单级别',
     'modelListFinanceBalanceAuditListStockistLevel'=> '报单中心级别',