From c1e8dd6c4d360b88fce567d7bbbbe73f230cad34 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Wed, 29 Dec 2021 20:52:02 +0800
Subject: [PATCH] edit

---
 .../payment-record/payment-record.component.html       |  5 ++++-
 .../recharge-record/recharge-record.component.ts       | 10 +++++-----
 .../services/freight-account.service.ts                |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/app/routes/financial-management/components/payment-record/payment-record.component.html b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
index 6497f658..e4b4f217 100644
--- a/src/app/routes/financial-management/components/payment-record/payment-record.component.html
+++ b/src/app/routes/financial-management/components/payment-record/payment-record.component.html
@@ -39,7 +39,10 @@
             {{ item.orderPaymentCode }} <br> <a>{{ item.paymentStatusLabel }}</a>
         </ng-template>
         <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
-            预付:￥{{ item.price }}<br />附加费:￥ {{ item.surcharge }}
+            预付:￥{{ item.price }}<br />
+            <ng-container *ngIf="item.payType==='1'">
+                附加费:￥ {{ item.surcharge }}
+            </ng-container>
         </ng-template>
         <ng-template st-row="billCode" let-item let-index="index" let-column="column">
             {{ item.billCode }} <br> {{item.billStatusLabel }}
diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
index 2a0d80fe..38d9e23f 100644
--- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
+++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
@@ -159,15 +159,15 @@ export class RechargeRecordComponent implements OnInit {
     return [
       { title: '充值时间', index: 'createTime', type: 'date' },
       { title: '充值单号', index: 'rechargeNo' },
-      { title: '网络货运人', index: 'ltdId' },
-      { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+      { title: '网络货运人', index: 'ltdName' },
+      { title: '银行类型', index: 'bankType' },
       { title: '账户类型', index: 'accountType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行', 3: '运营商账户' } },
       { title: '账户名称', index: 'rechargeName' },
       { title: '虚拟账户', index: 'virtualAccount' },
       { title: '充值金额', index: 'rechargeAmount' },
-      { title: '充值银行账户', render: 'transferBankAccount', format: item => `中国招商银行</br>6238293829388888` },
-      { title: '充值方式', index: 'payChannel', type: 'enum', enum: { 1: '线下充值' } },
-      { title: '充值状态', index: 'rechargeStatus', type: 'enum', enum: { 1: '充值中', 2: '充值失败', 3: '充值成功' } },
+      { title: '充值银行账户', render: 'transferBankAccount' },
+      { title: '充值方式', index: 'payChannel' },
+      { title: '充值状态', index: 'rechargeStatus' },
       { title: '银行流水号', index: 'paySerialNumber' },
       {
         title: '操作',
diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts
index 47f4ea06..bc7b699e 100644
--- a/src/app/routes/financial-management/services/freight-account.service.ts
+++ b/src/app/routes/financial-management/services/freight-account.service.ts
@@ -37,7 +37,7 @@ export class FreightAccountService extends ShipperBaseService {
   $api_disagree_refund = '/api/fcc/refundApplicationSMC/disagreeRefund';
 
   // 查询充值信息表
-  $api_get_recharge_page = '/api/fcc/rechargeInfo/list/page';
+  $api_get_recharge_page = '/api/fcc/rechargeInfo/list/pageByOperator';
   // 查询异常入金
   $api_get_abnormal_gold_page = '/api/fcc/rechargeInfo/list/page';
   // 运营端获取账户余额交易明细