From d73a9654374257e5d0520ee001604ee32e4dfe8c Mon Sep 17 00:00:00 2001
From: Joe <joe_96@163.com>
Date: Sat, 16 Mar 2024 23:34:01 +0800
Subject: [PATCH] up

---
 src/pages/BusinessList/detail.tsx         |  7 +++++-
 src/pages/BusinessList/index.tsx          |  5 ++++
 src/services/pop-b2b2c/errorController.ts | 30 +++++++++++------------
 src/services/pop-b2b2c/typings.d.ts       | 14 ++++++++++-
 4 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/pages/BusinessList/detail.tsx b/src/pages/BusinessList/detail.tsx
index 3c78f47..5dfbc07 100644
--- a/src/pages/BusinessList/detail.tsx
+++ b/src/pages/BusinessList/detail.tsx
@@ -198,6 +198,7 @@ const Detail: React.FC<any> = () => {
               pbcBusinessHeadUserNo: info.pbcBusinessHeadUserNo,
               pbcBusinessStartDate: info.pbcBusinessStartDate,
               pbcBusinessBank: info.pbcBusinessBank,
+              pbcBusinessAccountName: info.pbcBusinessAccountName,
               pbcBusinessAccount: info.pbcBusinessAccount,
               pbcBusinessMainCategory: info.pbcBusinessMainCategory,
               pbcBusinessLicenseUrl: info.pbcBusinessLicenseUrl
@@ -274,10 +275,14 @@ const Detail: React.FC<any> = () => {
                 key: 'pbcBusinessBank',
                 dataIndex: 'pbcBusinessBank',
               },
+              {
+                title: '商户账户名称',
+                key: 'pbcBusinessAccountName',
+                dataIndex: 'pbcBusinessAccountName',
+              },
               {
                 title: '收款账号',
                 key: 'pbcBusinessAccount',
-                span: 2,
                 dataIndex: 'pbcBusinessAccount',
               },
               {
diff --git a/src/pages/BusinessList/index.tsx b/src/pages/BusinessList/index.tsx
index bca2416..5b6e93b 100644
--- a/src/pages/BusinessList/index.tsx
+++ b/src/pages/BusinessList/index.tsx
@@ -60,6 +60,11 @@ const TableList: React.FC<{}> = () => {
       title: '商户手机号',
       dataIndex: 'pbcBusinessContactMobile',
     },
+    {
+      title: '商户账户名称',
+      dataIndex: 'pbcBusinessAccountName',
+      search: false
+    },
     {
       title: '商户类别',
       dataIndex: 'pbcBusinessType',
diff --git a/src/services/pop-b2b2c/errorController.ts b/src/services/pop-b2b2c/errorController.ts
index f29cc7f..5f0967b 100644
--- a/src/services/pop-b2b2c/errorController.ts
+++ b/src/services/pop-b2b2c/errorController.ts
@@ -2,41 +2,41 @@
 /* eslint-disable */
 import request from '@/utils/request';
 
-/** error GET /error */
-export async function errorUsingGet(options?: { [key: string]: any }) {
-  return request<Record<string, any>>('/error', {
+/** errorHtml GET /error */
+export async function errorHtmlUsingGet(options?: { [key: string]: any }) {
+  return request<API.ModelAndView>('/error', {
     method: 'GET',
     ...(options || {}),
   });
 }
 
-/** error PUT /error */
-export async function errorUsingPut(options?: { [key: string]: any }) {
-  return request<Record<string, any>>('/error', {
+/** errorHtml PUT /error */
+export async function errorHtmlUsingPut(options?: { [key: string]: any }) {
+  return request<API.ModelAndView>('/error', {
     method: 'PUT',
     ...(options || {}),
   });
 }
 
-/** error POST /error */
-export async function errorUsingPost(options?: { [key: string]: any }) {
-  return request<Record<string, any>>('/error', {
+/** errorHtml POST /error */
+export async function errorHtmlUsingPost(options?: { [key: string]: any }) {
+  return request<API.ModelAndView>('/error', {
     method: 'POST',
     ...(options || {}),
   });
 }
 
-/** error DELETE /error */
-export async function errorUsingDelete(options?: { [key: string]: any }) {
-  return request<Record<string, any>>('/error', {
+/** errorHtml DELETE /error */
+export async function errorHtmlUsingDelete(options?: { [key: string]: any }) {
+  return request<API.ModelAndView>('/error', {
     method: 'DELETE',
     ...(options || {}),
   });
 }
 
-/** error PATCH /error */
-export async function errorUsingPatch(options?: { [key: string]: any }) {
-  return request<Record<string, any>>('/error', {
+/** errorHtml PATCH /error */
+export async function errorHtmlUsingPatch(options?: { [key: string]: any }) {
+  return request<API.ModelAndView>('/error', {
     method: 'PATCH',
     ...(options || {}),
   });
diff --git a/src/services/pop-b2b2c/typings.d.ts b/src/services/pop-b2b2c/typings.d.ts
index 7e3130a..fd4ed8f 100644
--- a/src/services/pop-b2b2c/typings.d.ts
+++ b/src/services/pop-b2b2c/typings.d.ts
@@ -757,6 +757,8 @@ declare namespace API {
   type PbcBusiness = {
     /** 商户对公账户 */
     pbcBusinessAccount?: string;
+    /** 商户账户名称 */
+    pbcBusinessAccountName?: string;
     /** 商户地址 */
     pbcBusinessAddress?: string;
     /** 商户区域 */
@@ -830,6 +832,8 @@ declare namespace API {
   type PbcBusinessApproval = {
     /** 商户对公账户 */
     pbcBusinessAccount?: string;
+    /** 商户账户名称 */
+    pbcBusinessAccountName?: string;
     /** 商户详细地址 */
     pbcBusinessAddress?: string;
     /** 商户申请认证审批不通过原因 */
@@ -903,6 +907,8 @@ declare namespace API {
     code?: string;
     /** 商户对公账户 */
     pbcBusinessAccount?: string;
+    /** 商户账户名称 */
+    pbcBusinessAccountName?: string;
     /** 商户详细地址 */
     pbcBusinessAddress?: string;
     /** 商户申请认证审批不通过原因 */
@@ -976,6 +982,8 @@ declare namespace API {
   type PbcBusinessFrontChangeVO = {
     /** 商户对公账户 */
     pbcBusinessAccount?: string;
+    /** 商户账户名称 */
+    pbcBusinessAccountName?: string;
     /** 商户地址 */
     pbcBusinessAddress?: string;
     /** 商户区域 */
@@ -1903,7 +1911,7 @@ declare namespace API {
     pbcCreateBy?: number;
     /** 创建人 */
     pbcCreateByUserName?: string;
-    /** 主键 */
+    /** 主键，前端无需传 */
     pbcId?: number;
     /** 留言内容，必须 */
     pbcMessage?: string;
@@ -1927,6 +1935,10 @@ declare namespace API {
     pbcUpdateBy?: number;
     /** 更新人 */
     pbcUpdateByUserName?: string;
+    /** 用户id，前端无需传 */
+    pbcUserId?: number;
+    /** 0表示商户，1表示会员, 2管理员，前端无需传 */
+    pbcUserType?: number;
   };
 
   type PbcUserMessageVO = {