提现记录、账户明细接口对接

2022-03-17 19:35:35 +08:00
parent f18d53130a
commit 9c5fdabab9
7 changed files with 53 additions and 39 deletions
--- a/src/app/routes/partner/account-management/components/list/list.component.html
+++ b/src/app/routes/partner/account-management/components/list/list.component.html
@ -18,21 +18,18 @@
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
    [loading]="service.http.loading">
-    <ng-template st-row="approvalStatus" let-item>
-      <a [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney}}</a>
+    <ng-template st-row="allBalance" let-item>
+      <div class="text-right">{{item.allBalance | currency:' '}}</div>
    </ng-template>
-    <ng-template st-row="approvalStatus1" let-item>
-      <div class="text-right">{{item.approvalStatus1 | currency:' '}}</div>
-    </ng-template>
-    <ng-template st-row="approvalStatus2" let-item>
+    <ng-template st-row="unEntryAmount" let-item>
      <a class="text-right text-blue-dark"
-        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.yskmoney | currency:'
+        [routerLink]="'/partner/account-management/am/recorded/detail/'+item?.id">{{item.unEntryAmount | currency:'
        '}}</a>
    </ng-template>
-
-    <ng-template st-row="approvalStatus3" let-item>
-      <div class="text-right">{{item.yskmoney | currency:' '}}</div>
+    <ng-template st-row="availableBalance" let-item>
+      <div class="text-right">{{item.availableBalance | currency:' '}}</div>
    </ng-template>

+
  </st>
 </nz-card>
--- a/src/app/routes/partner/account-management/components/list/list.component.ts
+++ b/src/app/routes/partner/account-management/components/list/list.component.ts
@ -36,14 +36,14 @@ export class PartnerAccountManagementListComponent implements OnInit {
  initSF() {
    this.schema = {
      properties: {
-        abnormalCause: {
+        userName: {
          title: '合伙人名称',
          type: 'string',
          ui: {
            placeholder: '请输入',
          },
        },
-        abnormalCause1: {
+        phone: {
          title: '手机号',
          type: 'string',
          ui: {
@ -59,14 +59,15 @@ export class PartnerAccountManagementListComponent implements OnInit {
 */
  initST() {
    this.columns = [
-      { title: '合伙人名称', index: 'carNo', className: 'text-center', width: 300 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '账户总额（元）', render: 'approvalStatus1', className: 'text-right', sort: true, width: 200 },
-      { title: '待入账余额（元）', render: 'approvalStatus2', className: 'text-right', sort: true, width: 200 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', sort: true, width: 250 },
-      { title: '虚拟账户', index: 'approvalStatus4', className: 'text-center', width: 200 },
+      { title: '合伙人名称', index: 'userName', className: 'text-center', width: 250 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 200 },
+      { title: '账户总额（元）', render: 'allBalance', className: 'text-right', sort: true, width: 200 },
+      { title: '待入账余额（元）', render: 'unEntryAmount', className: 'text-right', sort: true, width: 200 },
+      { title: '可用余额（元）', render: 'availableBalance', className: 'text-right', sort: true, width: 250 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 200 },
      {
        title: '操作',
+        width: 100,
        buttons: [
          {
            text: '虚拟账户明细',
@ -94,7 +95,7 @@ export class PartnerAccountManagementListComponent implements OnInit {
      nzTitle: '虚拟账户明细',
      nzContent: PartnerAccountManagementVirtualAccountDetailComponent,
      nzComponentParams: {
-        id: _record?.id
+        roleId: _record?.roleId
      },
      nzWidth: '85%',
      nzFooter: null
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.html
@ -14,12 +14,23 @@
    </div>
  </div>
  <div class="mt-sm">
-    <st #st [data]="amService.$api_get_account_management_page" [columns]="columns" [columns]="columns"
+    <st #st [data]="service. $api_get_virtual_detail_page" [columns]="columns" [columns]="columns"
      [scroll]="{ x: '1200px' }"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
      [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="amService.http.loading"></st>
+      [loading]="service.http.loading">
+      <ng-template st-row="allBalance" let-item>
+        <div class="text-right">
+          {{item.allBalance}}
+        </div>
+      </ng-template>
+      <ng-template st-row="availableBalance" let-item>
+        <div class="text-right">
+          {{item.availableBalance}}
+        </div>
+      </ng-template>
+    </st>
  </div>
 </nz-card>
 <div class="modal-footer text-center">
--- a/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
+++ b/src/app/routes/partner/account-management/components/virtual-account-detail/virtual-account-detail.component.ts
@ -17,13 +17,15 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
  @ViewChild('st') private readonly st!: STComponent;
  @ViewChild('sf') private readonly sf!: SFComponent;
  columns: STColumn[] = [];
-  id = '';
+  roleId = '';
  _$expand = false;

-  constructor(public shipperservice: ShipperBaseService, public amService: AccountManagemantService, private modalRef: NzModalRef) { }
+  constructor(public shipperservice: ShipperBaseService, public service: AccountManagemantService,
+    private modalRef: NzModalRef) {
+  }

  get reqParams() {
-    return { ...this.sf?.value };
+    return { ...this.sf?.value, roleId: this.roleId };
  }
  ngOnInit(): void {
    this.initSF();
@ -36,14 +38,14 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
        _$expand: {
          type: 'boolean', ui: { hidden: true }
        },
-        abnormalCause: {
+        userName: {
          title: '合伙人名称',
          type: 'string',
          ui: {
            placeholder: '请输入',
          },
        },
-        abnormalCause1: {
+        phone: {
          title: '手机号',
          type: 'string',
          ui: {
@ -112,16 +114,15 @@ export class PartnerAccountManagementVirtualAccountDetailComponent implements On
 */
  initST() {
    this.columns = [
-      { title: '合伙人', index: 'carNo', className: 'text-center', width: 200 },
-      { title: '手机号', render: 'carModelLabel', className: 'text-center', width: 150 },
-      { title: '网络货运人', render: 'carModelLabel', className: 'text-center', width: 200 },
-      { title: '银行类型', render: 'carModelLabel', className: 'text-center', width: 120 },
-      { title: '虚拟账户', render: 'carModelLabel', className: 'text-center', width: 180 },
-      { title: '可用余额', render: 'approvalStatus1', className: 'text-right', width: 180 },
-      { title: '账户总余额', render: 'approvalStatus2', className: 'text-right', width: 180 },
-      { title: '可用余额（元）', render: 'approvalStatus3', className: 'text-right', width: 180 },
-      { title: '创建时间', index: 'approvalStatus4', className: 'text-center', width: 200 },
-      { title: '状态', index: 'approvalStatus4', className: 'text-center', width: 120 },
+      { title: '合伙人', index: 'name', className: 'text-center', width: 200 },
+      { title: '手机号', index: 'phone', className: 'text-center', width: 150 },
+      { title: '网络货运人', index: 'ltdName', className: 'text-center', width: 200 },
+      { title: '银行类型', index: 'bankTypeLabel', className: 'text-center', width: 120 },
+      { title: '虚拟账户', index: 'virtualAccount', className: 'text-center', width: 180 },
+      { title: '可用余额', render: 'availableBalance', className: 'text-center', width: 180 },
+      { title: '账户总余额', render: 'allBalance', className: 'text-center', width: 180 },
+      { title: '创建时间', index: 'createTime', className: 'text-center', width: 200 },
+      { title: '状态', index: 'stateDeletedLabel', className: 'text-center', width: 120 },
      {
        title: '操作',
        width: 120,
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.html
@ -41,7 +41,7 @@
    </div>
  </ng-template>

-  <st #st [data]="service.$api_get_refund_page" [columns]="columns" [req]="{  process: beforeReq }"
+  <st #st [data]="amService.$api_get_withdraw_record_page" [columns]="columns" [req]="{  process: beforeReq }"
    [loading]="service.http.loading" [scroll]="{ x:'1200px' }" (change)="stChange($event)"
    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: afterRes }"
    [page]="{ show: true,  pageSizes:  [10, 20, 50, 100, 200, 500] }">
--- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
+++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts
@ -5,6 +5,7 @@ import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service';
 import Big from 'src/app/shared/utils/deal-precision';
+import { AccountManagemantService } from '../../services/account-managemant.service';


@Component({
@ -27,7 +28,7 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni
  refundStatus: any = '';

  msg = '';
-  constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }
+  constructor(public service: FreightAccountService, public amService: AccountManagemantService, private nzModalService: NzModalService, private router: Router, public ar: ActivatedRoute) { }

  ngOnInit(): void { }

--- a/src/app/routes/partner/account-management/services/account-managemant.service.ts
+++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts
@ -6,7 +6,10 @@ import { BaseService } from '@shared';
 })
 export class AccountManagemantService extends BaseService {

-  $api_get_account_management_page = `/api/fcc/ficoBrmH/list/page`;
+  $api_get_account_management_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceByOperator`; // 账户管理
+  $api_get_virtual_detail_page = `/api/bpc/accountBalancePartner/getPartnerAccountBalanceInfoByOperator`;//虚拟账户明细
+  $api_get_withdraw_record_page = `/api/fcc/refundApplicationOBC/list/partnerPage`;// 提现记录
+
  constructor(public injector: Injector) {
    super(injector)
  }