From d6b40fd09bf38dd6921c16a8dbcc6c18c0fc5e0c Mon Sep 17 00:00:00 2001
From: Joe <joe_96@163.com>
Date: Mon, 8 Jul 2024 17:27:51 +0800
Subject: [PATCH] up

---
 .../OperationsDashboard/BusinessDetail.tsx    |   5 +-
 .../OperationsDashboard/ProductDetail.tsx     |   6 +-
 src/pages/OperationsDashboard/index.tsx       |   3 +-
 src/services/pop-b2b2c/errorController.ts     |  30 ++--
 .../pop-b2b2c/pbcUserRecordLogController.ts   |  93 +++++++++++
 src/services/pop-b2b2c/typings.d.ts           | 150 +++++++++++++++++-
 6 files changed, 257 insertions(+), 30 deletions(-)

diff --git a/src/pages/OperationsDashboard/BusinessDetail.tsx b/src/pages/OperationsDashboard/BusinessDetail.tsx
index ba00058..1eb2cfd 100644
--- a/src/pages/OperationsDashboard/BusinessDetail.tsx
+++ b/src/pages/OperationsDashboard/BusinessDetail.tsx
@@ -1,8 +1,5 @@
 import Constants from '@/constants';
 import { exportOperationalBusinessDataUsingPost, operationalBusinessDataUsingPost } from '@/services/pop-b2b2c/pbcUserRecordLogController';
-import {
-  pbcUsersPageUsingPost,
-} from '@/services/pop-b2b2c/pbcUsersController';
 import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { PageContainer } from '@ant-design/pro-layout';
 import { useSearchParams } from '@umijs/max';
@@ -141,7 +138,7 @@ const TableList: React.FC<{}> = () => {
         formRef={ref}
         toolbar={{
           actions: [
-            <Button type="primary" onClick={() => {
+            <Button type="primary" key="export" onClick={() => {
               const values = ref.current?.getFieldsValue();
               const queryParam = {
                 userId: userId ? parseInt(userId) : undefined,
diff --git a/src/pages/OperationsDashboard/ProductDetail.tsx b/src/pages/OperationsDashboard/ProductDetail.tsx
index fc75a1e..1ca303f 100644
--- a/src/pages/OperationsDashboard/ProductDetail.tsx
+++ b/src/pages/OperationsDashboard/ProductDetail.tsx
@@ -1,9 +1,5 @@
 import Constants from '@/constants';
-import { listAdminTreeUsingGet } from '@/services/pop-b2b2c/pbcCategoryController';
 import { exportOperationalProductDataUsingPost, operationalProductDataUsingPost } from '@/services/pop-b2b2c/pbcUserRecordLogController';
-import {
-  pbcUsersPageUsingPost,
-} from '@/services/pop-b2b2c/pbcUsersController';
 import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { PageContainer } from '@ant-design/pro-layout';
 import { useSearchParams } from '@umijs/max';
@@ -126,7 +122,7 @@ const TableList: React.FC<{}> = () => {
         formRef={ref}
         toolbar={{
           actions: [
-            <Button type="primary" onClick={() => {
+            <Button type="primary" key="export" onClick={() => {
               const values: any = ref.current?.getFieldsValue();
               const queryParam = {
                 userId: userId ? parseInt(userId) : undefined,
diff --git a/src/pages/OperationsDashboard/index.tsx b/src/pages/OperationsDashboard/index.tsx
index cdd3395..1100ba9 100644
--- a/src/pages/OperationsDashboard/index.tsx
+++ b/src/pages/OperationsDashboard/index.tsx
@@ -1,6 +1,5 @@
 import { queryAllRoleUsingPost } from '@/services/pop-b2b2c/pbcRoleController';
 import { exportOperationalDashboardUsingPost, operationalDashboardUsingPost } from '@/services/pop-b2b2c/pbcUserRecordLogController';
-import { handlePageQuery } from '@/utils/utils';
 import { ActionType, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { PageContainer } from '@ant-design/pro-layout';
 import { Link } from '@umijs/max';
@@ -124,7 +123,7 @@ const TableList: React.FC<{}> = () => {
         formRef={ref}
         toolbar={{
           actions: [
-            <Button type="primary" onClick={() => {
+            <Button type="primary" key="export" onClick={() => {
               const values = ref.current?.getFieldsValue();
               const queryParam = {
                 userName: values?.pbcUserName,
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/pbcUserRecordLogController.ts b/src/services/pop-b2b2c/pbcUserRecordLogController.ts
index eefc0d5..4983a71 100644
--- a/src/services/pop-b2b2c/pbcUserRecordLogController.ts
+++ b/src/services/pop-b2b2c/pbcUserRecordLogController.ts
@@ -2,6 +2,39 @@
 /* eslint-disable */
 import request from '@/utils/request';
 
+/** 商户浏览排行榜 POST /b2b2c/statical/businessViewRank */
+export async function businessViewRankUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultIPagePbcBusinessViewRankVO_>('/b2b2c/statical/businessViewRank', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 渠道商家明细 POST /b2b2c/statical/channelMerchantDetail */
+export async function channelMerchantDetailUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultIPagePbcChannelMerchantDetailVO_>(
+    '/b2b2c/statical/channelMerchantDetail',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      data: body,
+      ...(options || {}),
+    },
+  );
+}
+
 /** 管理端，仪表盘 管理端，仪表盘 POST /b2b2c/statical/dashboard */
 export async function dashboardUsingPost(
   body: API.PbcDashBoardDTO,
@@ -32,6 +65,36 @@ export async function detailUsingPost(
   });
 }
 
+/** 导出商户浏览排行榜 POST /b2b2c/statical/exportBusinessViewRank */
+export async function exportBusinessViewRankUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultString_>('/b2b2c/statical/exportBusinessViewRank', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
+/** 导出渠道商家明细 POST /b2b2c/statical/exportChannelMerchantDetail */
+export async function exportChannelMerchantDetailUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultString_>('/b2b2c/statical/exportChannelMerchantDetail', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 导出运营人员的导入商户数据 POST /b2b2c/statical/exportOperationalBusinessData */
 export async function exportOperationalBusinessDataUsingPost(
   body: API.PbcOperationalDashboardDTO,
@@ -77,6 +140,21 @@ export async function exportOperationalProductDataUsingPost(
   });
 }
 
+/** 导出扫码人明细 POST /b2b2c/statical/exportPeopleScanDetail */
+export async function exportPeopleScanDetailUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultString_>('/b2b2c/statical/exportPeopleScanDetail', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 获取运营人员的导入商户数据 POST /b2b2c/statical/operationalBusinessData */
 export async function operationalBusinessDataUsingPost(
   body: API.PbcOperationalDashboardDTO,
@@ -139,6 +217,21 @@ export async function overViewUsingPost(options?: { [key: string]: any }) {
   });
 }
 
+/** 扫码人明细 POST /b2b2c/statical/peopleScanDetail */
+export async function peopleScanDetailUsingPost(
+  body: API.PbcOperationalDashboardDTO,
+  options?: { [key: string]: any },
+) {
+  return request<API.AjaxResultIPagePbcPeopleScanDetailVO_>('/b2b2c/statical/peopleScanDetail', {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+    },
+    data: body,
+    ...(options || {}),
+  });
+}
+
 /** 用登陆后的用户id替换未登录的用户id POST /b2b2c/statical/replaceLogUserId */
 export async function replaceLogUserIdUsingPost(
   body: API.PbcDashBoardDTO,
diff --git a/src/services/pop-b2b2c/typings.d.ts b/src/services/pop-b2b2c/typings.d.ts
index 0221da2..110c35b 100644
--- a/src/services/pop-b2b2c/typings.d.ts
+++ b/src/services/pop-b2b2c/typings.d.ts
@@ -60,6 +60,18 @@ declare namespace API {
     retmsg?: string;
   };
 
+  type AjaxResultIPagePbcBusinessViewRankVO_ = {
+    data?: IPagePbcBusinessViewRankVO_;
+    retcode?: number;
+    retmsg?: string;
+  };
+
+  type AjaxResultIPagePbcChannelMerchantDetailVO_ = {
+    data?: IPagePbcChannelMerchantDetailVO_;
+    retcode?: number;
+    retmsg?: string;
+  };
+
   type AjaxResultIPagePbcOperationalBusinessDataVO_ = {
     data?: IPagePbcOperationalBusinessDataVO_;
     retcode?: number;
@@ -72,6 +84,12 @@ declare namespace API {
     retmsg?: string;
   };
 
+  type AjaxResultIPagePbcPeopleScanDetailVO_ = {
+    data?: IPagePbcPeopleScanDetailVO_;
+    retcode?: number;
+    retmsg?: string;
+  };
+
   type AjaxResultIPagePbcProductVO_ = {
     data?: IPagePbcProductVO_;
     retcode?: number;
@@ -544,6 +562,22 @@ declare namespace API {
     total?: number;
   };
 
+  type IPagePbcBusinessViewRankVO_ = {
+    current?: number;
+    pages?: number;
+    records?: PbcBusinessViewRankVO[];
+    size?: number;
+    total?: number;
+  };
+
+  type IPagePbcChannelMerchantDetailVO_ = {
+    current?: number;
+    pages?: number;
+    records?: PbcChannelMerchantDetailVO[];
+    size?: number;
+    total?: number;
+  };
+
   type IPagePbcOperationalBusinessDataVO_ = {
     current?: number;
     pages?: number;
@@ -560,6 +594,14 @@ declare namespace API {
     total?: number;
   };
 
+  type IPagePbcPeopleScanDetailVO_ = {
+    current?: number;
+    pages?: number;
+    records?: PbcPeopleScanDetailVO[];
+    size?: number;
+    total?: number;
+  };
+
   type IPagePbcProductVO_ = {
     current?: number;
     pages?: number;
@@ -799,6 +841,7 @@ declare namespace API {
     pbcRegisterStaticalVO?: PbcRegisterStaticalVO;
     pbcScanCodeStaticalVO?: PbcScanCodeStaticalVO;
     pbcVisitStaticalVO?: PbcVisitStaticalVO;
+    searchWordListVO?: PbcSearchKeyVO[];
   };
 
   type PbcAuthority = {
@@ -1291,6 +1334,49 @@ declare namespace API {
     pbcBusinessVisitCount?: number;
   };
 
+  type PbcBusinessViewRankVO = {
+    /** 商户id */
+    businessId?: number;
+    /** 商户对公账户 */
+    pbcBusinessAccount?: string;
+    /** 商户地址 */
+    pbcBusinessAddress?: string;
+    /** 商户区域 */
+    pbcBusinessArea?: string;
+    /** 商户对公账户银行 */
+    pbcBusinessBank?: string;
+    /** 商户城市 */
+    pbcBusinessCity?: string;
+    /** 商户编号, 审核通过后生成 */
+    pbcBusinessCode?: string;
+    /** 商户联系人 */
+    pbcBusinessContact?: string;
+    /** 商户手机号 */
+    pbcBusinessContactMobile?: string;
+    /** 商户联系人身份证 */
+    pbcBusinessContactUserNo?: string;
+    /** 商户等级 */
+    pbcBusinessLevel?: string;
+    /** 商户主营范围 */
+    pbcBusinessMainCategory?: string;
+    /** 商户名称 */
+    pbcBusinessName?: string;
+    /** 商户省份 */
+    pbcBusinessProvince?: string;
+    /** 开业时间 */
+    pbcBusinessStartDate?: string;
+    /** 商户类型 */
+    pbcBusinessType?: string;
+    /** 创建时间 */
+    pbcCreateAt?: string;
+    /** 浏览次数 */
+    pbcProductVisitCount?: number;
+    /** 社会统一信用代码 */
+    pbcUnifiedSocialCreditCode?: string;
+    /** 序号 */
+    serialNumber?: number;
+  };
+
   type PbcBusinessViewStaticalVO = {
     pbcBusinessRankList?: PbcBusinessViewCountVO[];
   };
@@ -1345,6 +1431,19 @@ declare namespace API {
     pbcId?: number;
   };
 
+  type PbcChannelMerchantDetailVO = {
+    /** 商户id */
+    businessId?: number;
+    /** 商户编号, 审核通过后生成 */
+    pbcBusinessCode?: string;
+    /** 商户名称 */
+    pbcBusinessName?: string;
+    /** 有三种，qrcode，share，link */
+    pbcDataSource?: string;
+    /** 序号 */
+    serialNumber?: number;
+  };
+
   type PbcCommonData = {
     /** 值列表 */
     commonDataValueList?: PbcCommonDataValue[];
@@ -1435,11 +1534,13 @@ declare namespace API {
     anonToken?: string;
     /** 商户id */
     businessId?: number;
+    /** 结束日期 */
     endDate?: string;
     pbcCategoryType?: number;
     pbcQueryType?: number;
     /** 分享人的id */
     pbcUserId?: number;
+    /** 开始日期 */
     startDate?: string;
   };
 
@@ -1457,6 +1558,8 @@ declare namespace API {
 
   type PbcInteractStaticalVO = {
     pbcColectNumber?: number;
+    /** 新增商品浏览次数 */
+    pbcNewGoodsViewNumber?: number;
     pbcViewTotalNumber?: number;
   };
 
@@ -1512,6 +1615,16 @@ declare namespace API {
     endDate?: string;
     /** 条数 */
     pageSize?: number;
+    /** 商户编号, 审核通过后生成 */
+    pbcBusinessCode?: string;
+    /** 商户id */
+    pbcBusinessId?: number;
+    /** 商户名称 */
+    pbcBusinessName?: string;
+    /** 有三种，qrcode，share，link */
+    pbcDataSource?: string;
+    /** 1表示是新用户扫码，0表示不是 */
+    pbcNewCodeScanState?: number;
     /** 角色id */
     roleId?: number;
     /** 角色名称 */
@@ -1553,6 +1666,21 @@ declare namespace API {
     serialNumber?: number;
   };
 
+  type PbcPeopleScanDetailVO = {
+    /** 扫码时间 */
+    pbcCreateAt?: string;
+    /** 用户id */
+    pbcUserId?: string;
+    /** 用户手机号 */
+    pbcUserMobile?: string;
+    /** 用户姓名 */
+    pbcUserName?: string;
+    /** 新老客 */
+    pbcUserType?: string;
+    /** 序号 */
+    serialNumber?: number;
+  };
+
   type PbcProduct = {
     /** 商户id */
     pbcBusinessId?: number;
@@ -1623,6 +1751,10 @@ declare namespace API {
   };
 
   type PbcProductCollectCountVO = {
+    /** 商户id */
+    businessId?: number;
+    /** 商户名称 */
+    businessName?: string;
     pbcProductCollectCount?: number;
     pbcProductName?: string;
   };
@@ -1814,6 +1946,10 @@ declare namespace API {
   };
 
   type PbcProductViewCountVO = {
+    /** 商户id */
+    businessId?: number;
+    /** 商户名称 */
+    businessName?: string;
     pbcProductName?: string;
     pbcProductVisitCount?: number;
   };
@@ -1963,17 +2099,23 @@ declare namespace API {
   };
 
   type PbcScanCodeStaticalVO = {
+    /** 新客扫码人数 */
+    newCustomerScanCount?: number;
+    /** 老客扫码人数 */
+    oldCustomerScanCount?: number;
+    /** 扫码次数 */
     pbcScanNumber?: number;
+    /** 扫码人数 */
     pbcScanUserNumber?: number;
   };
 
   type PbcSearchKeyDTO = {
     /** 商户id */
     businessId?: number;
-    /** 结束时间 */
-    endTime?: string;
-    /** 开始时间 */
-    startTime?: string;
+    /** 结束日期 */
+    endDate?: string;
+    /** 开始日期 */
+    startDate?: string;
   };
 
   type PbcSearchKeyVO = {