admin update

admin/control/refill_analysis.php

@@ -3,7 +3,7 @@ include(BASE_CONFIG_PATH . CONFIG_PREFIX . '/refill.ini.php');
 require_once(BASE_ROOT_PATH . '/core/framework/function/http.php');
 class refill_analysisControl extends SystemControl
 {
-    private $ANALYSIS_URL = 'https://ylweb.xyzshops.cn';
+    private $ANALYSIS_URL = BASE_SITE_URL;
     
     public function __construct()
     {

admin/control/refill_evidence.php

@@ -107,10 +107,12 @@ class refill_evidenceControl extends SystemControl
 
     public function formatData($data, $merchant_list)
     {
+        global $config;
         $status_text = [merchantModel::status_applying =>'申请中', merchantModel::status_passed => '已通过', merchantModel::status_denied => '已驳回'];
         $operation_text = [merchantModel::oper_undeposited => '未预存', merchantModel::oper_deposited => '已预存'];
         $add_type_text = self::ADD_TYPE_TEXT;
         $is_bank_text = ['否','是'];
+        $receive_bank_text = $config['receive_bank'][COMPANY_NAME];
 
         $merchants = [];
         foreach ($merchant_list as $value) {
@@ -124,6 +126,7 @@ class refill_evidenceControl extends SystemControl
             $data[$key]['add_type_text'] = $add_type_text[$value['add_type']];
             $data[$key]['is_bank_text'] = $is_bank_text[$value['is_bank']];
             $data[$key]['company_name'] = $merchants[$value['mchid']]['company_name'] ?? $merchants[$value['mchid']]['name'];
+            $data[$key]['receive_bank_text'] = !empty($value['receive_bank']) ? $receive_bank_text[$value['receive_bank']] : '/';
         }
 
         return $data;

admin/templates/default/merchant.refill.evidence_list.php

@@ -202,7 +202,7 @@
                         <td><?php echo $v['amount']*100%100==0 ? intval($v['amount']) : $v['amount']; ?> (<?php echo $v['amount']>=10000 ? $v['amount']/10000 .'万' : $v['amount'] . '元';?>)</td>
                         <td class="align-left"><?php echo $v['bank_username']; ?></td>
                         <td class="align-left"><?php echo $v['bank_name']; ?></td>
-                        <td class="align-left"><?php echo $v['receive_bank'] ? $output['receive_bank_text'][$v['receive_bank']-1] : '/'; ?></td>
+                        <td class="align-left"><?php echo $v['receive_bank_text']; ?></td>
                         <td>
                             <?php if ($v['is_operation'] == 1 && $v['status'] !=3 ){
                                 echo ncPriceFormat($v['available_predeposit'] + $v['amount']);
@@ -345,6 +345,7 @@
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].after_available + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].bank_username + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].bank_name + '</td>';
+                row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].receive_bank_text + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].status_text + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].operation_text + '</td>';
                 row += '<td style=font-size:14px;'+ 'mso-number-format:"\@"'+ '>' + arrData[i].add_time + '</td>';
@@ -450,7 +451,7 @@
                     head.push('充值成功金额：' + data.stats.success_amount)
                     head.push('已驳回金额：' + data.stats.cancel_amount)
                     head.push('待处理充值金额：' + data.stats.send_amount)
-                    let title = [{value: "序号"},{value: "申请编号"},{value: "机构名称"},{value: "申请金额"},{value: "申请后可用金额"},{value: "转账银行开户人姓名"},{value: "转账银行名称"},{value: "申请状态"},{value: "预存状态"},{value: "申请日期"},{value: "审核日期"}, {value: "审核管理员"},{value: "备注信息"},{value: "预存方式"}]
+                    let title = [{value: "序号"},{value: "申请编号"},{value: "机构名称"},{value: "申请金额"},{value: "申请后可用金额"},{value: "转账银行开户人姓名"},{value: "转账银行名称"},{value: "收款银行"},{value: "申请状态"},{value: "预存状态"},{value: "申请日期"},{value: "审核日期"}, {value: "审核管理员"},{value: "备注信息"},{value: "预存方式"}]
                     JSONToExcelConvertor(data.data, '充值申请', title, head)
                 }
             })