From 9f0b3da44cb7c5fc6586f266fcb388f25b04add8 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Mon, 7 Mar 2022 11:22:56 +0800
Subject: [PATCH] e

---
 .../captain-detail.component.html             | 17 ++---
 .../captain-detail.component.ts               | 11 ++++
 .../driver/detail/detail.component.html       | 63 ++++++++++---------
 .../driver/detail/detail.component.ts         | 13 +++-
 .../usercenter/services/usercenter.service.ts |  3 +
 5 files changed, 71 insertions(+), 36 deletions(-)

diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
index aadc3214..faa34e76 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
+++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
@@ -101,13 +101,16 @@
   </div>
 
   <sv-container col="3" class="mt-md">
-    <sv-title>银行结算信息</sv-title>
-    <sv label="开户银行">
-      {{ userIdentityDetail?.name }}
-    </sv>
-    <sv label="银行卡号">
-      {{ userIdentityDetail?.certificateNumber }}
-    </sv>
+    <sv-title>银行结算信息<ng-container *ngIf="bankList?.length===0">（暂无银行信息）</ng-container></sv-title>
+    <ng-container *ngFor="let item of bankList">
+      <sv label="开户银行">
+        {{ item.bankName }}
+      </sv>
+      <sv label="银行卡号">
+        {{ item?.bankCardNumber }}
+      </sv>
+    </ng-container>
+
   </sv-container>
 </nz-card>
 
diff --git a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts
index 93498067..b5179dd0 100644
--- a/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.ts
@@ -17,6 +17,7 @@ export class CaptainDetailComponent implements OnInit {
   userDetail: any;
   userIdentityDetail: any = {};
   tempalateUserIdentityDetail = { ...this.userIdentityDetail };
+  bankList: any[] = [];
 
   @ViewChild('redectModal', { static: false })
   redectModal!: any;
@@ -61,6 +62,16 @@ export class CaptainDetailComponent implements OnInit {
           this.tempalateUserIdentityDetail = { ...this.userIdentityDetail };
         }
       });
+    // 获取用户银行信息
+    this.service
+      .request(this.service.$api_get_user_bank_list, {
+        roleId: this.route.snapshot.params.id
+      })
+      .subscribe(res => {
+        if (res) {
+          this.bankList = res;
+        }
+      });
   }
 
   /** 启用/冻结司机 */
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html
index 6816bba8..905cb579 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html
@@ -94,10 +94,10 @@
         <input nz-input type="text" [(ngModel)]="userIdentityDetail.certificateNumber" [readonly]="!isEditUser"
           [nzBorderless]="!isEditUser" [placeholder]="isEditUser?'':'-'">
       </sv>
-      <sv label="有效期"  col="1">
+      <sv label="有效期" col="1">
         <nz-date-picker [(ngModel)]="userIdentityDetail.validStartTime" [nzDisabled]="!isEditUser" nzPlaceHolder=" "
-        [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 110px;" class="calendar">
-      </nz-date-picker>
+          [nzBorderless]="!isEditUser" [nzSuffixIcon]="isEditUser?'calendar':''" style="width: 110px;" class="calendar">
+        </nz-date-picker>
         -
         <ng-container *ngIf="!isEditUser && !userIdentityDetail?.validEndTime && userIdentityDetail?.validStartTime">
           <label style="padding-left: 11px;">长期</label>
@@ -110,7 +110,7 @@
             (ngModelChange)="$event?userIdentityDetail.validEndTime='':''" class="ml-sm">长期</label>
         </ng-container>
       </sv>
-  
+
       <sv label="身份证照" col="1">
         <div class="d-flex">
           <ng-container
@@ -166,19 +166,21 @@
       </sv>
       <sv label="有效期" col="1">
         <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
-        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
-      </nz-date-picker>
-      -
-      <ng-container *ngIf="!isEditDriver && !driverDetail?.validEndTime && driverDetail?.validStartTime">
-        <label style="padding-left: 11px;">长期</label>
-      </ng-container>
-      <nz-date-picker [(ngModel)]="driverDetail.validEndTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
-        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
-      </nz-date-picker>
-      <ng-container *ngIf="isEditDriver">
-        <label nz-checkbox [ngModel]="!!!driverDetail.validEndTime"
-          (ngModelChange)="$event?driverDetail.validEndTime='':''" class="ml-sm">长期</label>
-      </ng-container>
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"
+          class="calendar">
+        </nz-date-picker>
+        -
+        <ng-container *ngIf="!isEditDriver && !driverDetail?.validEndTime && driverDetail?.validStartTime">
+          <label style="padding-left: 11px;">长期</label>
+        </ng-container>
+        <nz-date-picker [(ngModel)]="driverDetail.validEndTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"
+          class="calendar">
+        </nz-date-picker>
+        <ng-container *ngIf="isEditDriver">
+          <label nz-checkbox [ngModel]="!!!driverDetail.validEndTime"
+            (ngModelChange)="$event?driverDetail.validEndTime='':''" class="ml-sm">长期</label>
+        </ng-container>
       </sv>
       <!-- <sv label="有效期起">
         <nz-date-picker [(ngModel)]="driverDetail.validStartTime" [nzDisabled]="!isEditDriver"
@@ -229,14 +231,16 @@
       </sv> -->
       <sv label="发证日期" col="2">
         <nz-date-picker [(ngModel)]="licenseDetail.validStartTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
-        [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
-      </nz-date-picker>
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"
+          class="calendar">
+        </nz-date-picker>
         -
         <ng-container *ngIf="!isEditDriver && !licenseDetail?.validEndTime && licenseDetail?.validStartTime">
           <label style="padding-left: 11px;">长期</label>
         </ng-container>
         <nz-date-picker [(ngModel)]="licenseDetail.validEndTime" [nzDisabled]="!isEditDriver" nzPlaceHolder=" "
-          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;" class="calendar">
+          [nzBorderless]="!isEditDriver" [nzSuffixIcon]="isEditDriver?'calendar':''" style="width: 110px;"
+          class="calendar">
         </nz-date-picker>
         <ng-container *ngIf="isEditDriver">
           <label nz-checkbox [ngModel]="!!!licenseDetail.validEndTime"
@@ -244,7 +248,7 @@
         </ng-container>
 
       </sv>
-  
+
       <sv label="从业资格证照片" col="1">
         <ng-container
           *ngTemplateOutlet="uploadTemplate;context:{data:licenseDetail,status:isEditDriver,key:'certificatePhotoWatermark',key2:'certificatePhoto',hover:'licenseCertificate'}">
@@ -291,13 +295,16 @@
   </sv-container>
 
   <sv-container col="3" class="mt-md">
-    <sv-title>银行结算信息</sv-title>
-    <sv label="开户银行">
-      {{ userIdentityDetail?.name }}
-    </sv>
-    <sv label="银行卡号">
-      {{ userIdentityDetail?.certificateNumber }}
-    </sv>
+    <sv-title>银行结算信息 <ng-container *ngIf="bankList?.length===0">（暂无银行信息）</ng-container>
+    </sv-title>
+    <ng-container *ngFor="let item of bankList">
+      <sv label="开户银行">
+        {{ item.bankName }}
+      </sv>
+      <sv label="银行卡号">
+        {{ item?.bankCardNumber }}
+      </sv>
+    </ng-container>
   </sv-container>
 
   <nz-divider></nz-divider>
diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.ts b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
index bb13924b..b85faf67 100644
--- a/src/app/routes/usercenter/components/driver/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/driver/detail/detail.component.ts
@@ -56,7 +56,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   adressCodeList: any = [];
   billEvaluateList: any = [];
   approvalOpinion = '';
-
+  bankList: any[] = [];
   isEditUser = false;
   isEditDriver = false;
 
@@ -132,6 +132,17 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
           this.billEvaluateList = res;
         }
       });
+
+    // 获取用户银行信息
+    this.service
+      .request(this.service.$api_get_user_bank_list, {
+        roleId: this.route.snapshot.params.id
+      })
+      .subscribe(res => {
+        if (res) {
+          this.bankList = res;
+        }
+      });
   }
 
   /** 启用/冻结司机 */
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index 57dda698..542708a9 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -71,6 +71,9 @@ export class UsermanageService extends ShipperBaseService {
   // 司机详情查看-获取用户关联的企业项目角色信息
   $api_get_driver_projects = '/api/mdc/cuc/user/getEnterpriceProjectInfo';
 
+  // 根据应用用户ID获取银行信息表
+  $api_get_user_bank_list = '/api/fcc/bankInfoOBC/list/page';
+
   // 获取服务评级
   $api_get_driver_billEvaluate = '/api/sdc/billEvaluate/getServiceRating';
   // 总评分