feat: 修改分组接口

2025-04-27 16:24:07 +08:00
parent 7deede374c
commit 92cf43d2ba
9 changed files with 143 additions and 92 deletions
--- a/src/api/generated/apis/ck-api.ts
+++ b/src/api/generated/apis/ck-api.ts
@@ -378,7 +378,7 @@ export const CkApiAxiosParamCreator = function (configuration?: Configuration) {
     * @param {ApiCookieInfoJdOrderListGetPageSizeEnum} pageSize 页码
     * @param {number} [cookieId] cookieId
     * @param {string} [cookie] cookie
-     * @param {string} [status] 状态
+     * @param {ApiCookieInfoJdOrderListGetStatusEnum} [status] 状态
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
@@ -387,7 +387,7 @@ export const CkApiAxiosParamCreator = function (configuration?: Configuration) {
      pageSize: ApiCookieInfoJdOrderListGetPageSizeEnum,
      cookieId?: number,
      cookie?: string,
-      status?: string,
+      status?: ApiCookieInfoJdOrderListGetStatusEnum,
      options: RawAxiosRequestConfig = {}
    ): Promise<RequestArgs> => {
      // verify required parameter 'current' is not null or undefined
@@ -713,7 +713,7 @@ export const CkApiFp = function (configuration?: Configuration) {
     * @param {ApiCookieInfoJdOrderListGetPageSizeEnum} pageSize 页码
     * @param {number} [cookieId] cookieId
     * @param {string} [cookie] cookie
-     * @param {string} [status] 状态
+     * @param {ApiCookieInfoJdOrderListGetStatusEnum} [status] 状态
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
@@ -722,7 +722,7 @@ export const CkApiFp = function (configuration?: Configuration) {
      pageSize: ApiCookieInfoJdOrderListGetPageSizeEnum,
      cookieId?: number,
      cookie?: string,
-      status?: string,
+      status?: ApiCookieInfoJdOrderListGetStatusEnum,
      options?: RawAxiosRequestConfig
    ): Promise<
      (
@@ -921,7 +921,7 @@ export const CkApiFactory = function (
     * @param {ApiCookieInfoJdOrderListGetPageSizeEnum} pageSize 页码
     * @param {number} [cookieId] cookieId
     * @param {string} [cookie] cookie
-     * @param {string} [status] 状态
+     * @param {ApiCookieInfoJdOrderListGetStatusEnum} [status] 状态
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
@@ -930,7 +930,7 @@ export const CkApiFactory = function (
      pageSize: ApiCookieInfoJdOrderListGetPageSizeEnum,
      cookieId?: number,
      cookie?: string,
-      status?: string,
+      status?: ApiCookieInfoJdOrderListGetStatusEnum,
      options?: RawAxiosRequestConfig
    ): AxiosPromise<KamiApiCardRedeemJdV1OrderListRes> {
      return localVarFp
@@ -1105,7 +1105,7 @@ export class CkApi extends BaseAPI {
   * @param {ApiCookieInfoJdOrderListGetPageSizeEnum} pageSize 页码
   * @param {number} [cookieId] cookieId
   * @param {string} [cookie] cookie
-   * @param {string} [status] 状态
+   * @param {ApiCookieInfoJdOrderListGetStatusEnum} [status] 状态
   * @param {*} [options] Override http request option.
   * @throws {RequiredError}
   * @memberof CkApi
@@ -1115,7 +1115,7 @@ export class CkApi extends BaseAPI {
    pageSize: ApiCookieInfoJdOrderListGetPageSizeEnum,
    cookieId?: number,
    cookie?: string,
-    status?: string,
+    status?: ApiCookieInfoJdOrderListGetStatusEnum,
    options?: RawAxiosRequestConfig
  ) {
    return CkApiFp(this.configuration)
@@ -1186,3 +1186,13 @@ export const ApiCookieInfoJdOrderListGetPageSizeEnum = {
 } as const;
 export type ApiCookieInfoJdOrderListGetPageSizeEnum =
  (typeof ApiCookieInfoJdOrderListGetPageSizeEnum)[keyof typeof ApiCookieInfoJdOrderListGetPageSizeEnum];
+/**
+ * @export
+ */
+export const ApiCookieInfoJdOrderListGetStatusEnum = {
+  Fail: 'fail',
+  Init: 'init',
+  Success: 'success'
+} as const;
+export type ApiCookieInfoJdOrderListGetStatusEnum =
+  (typeof ApiCookieInfoJdOrderListGetStatusEnum)[keyof typeof ApiCookieInfoJdOrderListGetStatusEnum];
--- a/src/api/generated/apis/default-api.ts
+++ b/src/api/generated/apis/default-api.ts
@@ -5687,12 +5687,16 @@ export const DefaultApiAxiosParamCreator = function (
     * @summary 分组统计
     * @param {number} current 页数
     * @param {ApiCardInfoWalmartGroupStatGetPageSizeEnum} pageSize 页码
+     * @param {string} [username] 用户名
+     * @param {string} [date] 日期
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
    apiCardInfoWalmartGroupStatGet: async (
      current: number,
      pageSize: ApiCardInfoWalmartGroupStatGetPageSizeEnum,
+      username?: string,
+      date?: string,
      options: RawAxiosRequestConfig = {}
    ): Promise<RequestArgs> => {
      // verify required parameter 'current' is not null or undefined
@@ -5723,6 +5727,14 @@ export const DefaultApiAxiosParamCreator = function (
        localVarQueryParameter['pageSize'] = pageSize;
      }

+      if (username !== undefined) {
+        localVarQueryParameter['username'] = username;
+      }
+
+      if (date !== undefined) {
+        localVarQueryParameter['date'] = date;
+      }
+
      setSearchParams(localVarUrlObj, localVarQueryParameter);
      let headersFromBaseOptions =
        baseOptions && baseOptions.headers ? baseOptions.headers : {};
@@ -13775,12 +13787,16 @@ export const DefaultApiFp = function (configuration?: Configuration) {
     * @summary 分组统计
     * @param {number} current 页数
     * @param {ApiCardInfoWalmartGroupStatGetPageSizeEnum} pageSize 页码
+     * @param {string} [username] 用户名
+     * @param {string} [date] 日期
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
    async apiCardInfoWalmartGroupStatGet(
      current: number,
      pageSize: ApiCardInfoWalmartGroupStatGetPageSizeEnum,
+      username?: string,
+      date?: string,
      options?: RawAxiosRequestConfig
    ): Promise<
      (
@@ -13792,6 +13808,8 @@ export const DefaultApiFp = function (configuration?: Configuration) {
        await localVarAxiosParamCreator.apiCardInfoWalmartGroupStatGet(
          current,
          pageSize,
+          username,
+          date,
          options
        );
      const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
@@ -18742,16 +18760,26 @@ export const DefaultApiFactory = function (
     * @summary 分组统计
     * @param {number} current 页数
     * @param {ApiCardInfoWalmartGroupStatGetPageSizeEnum} pageSize 页码
+     * @param {string} [username] 用户名
+     * @param {string} [date] 日期
     * @param {*} [options] Override http request option.
     * @throws {RequiredError}
     */
    apiCardInfoWalmartGroupStatGet(
      current: number,
      pageSize: ApiCardInfoWalmartGroupStatGetPageSizeEnum,
+      username?: string,
+      date?: string,
      options?: RawAxiosRequestConfig
    ): AxiosPromise<KamiApiCardInfoWalmartV1GroupStatRes> {
      return localVarFp
-        .apiCardInfoWalmartGroupStatGet(current, pageSize, options)
+        .apiCardInfoWalmartGroupStatGet(
+          current,
+          pageSize,
+          username,
+          date,
+          options
+        )
        .then(request => request(axios, basePath));
    },
    /**
@@ -22430,6 +22458,8 @@ export class DefaultApi extends BaseAPI {
   * @summary 分组统计
   * @param {number} current 页数
   * @param {ApiCardInfoWalmartGroupStatGetPageSizeEnum} pageSize 页码
+   * @param {string} [username] 用户名
+   * @param {string} [date] 日期
   * @param {*} [options] Override http request option.
   * @throws {RequiredError}
   * @memberof DefaultApi
@@ -22437,10 +22467,18 @@ export class DefaultApi extends BaseAPI {
  public apiCardInfoWalmartGroupStatGet(
    current: number,
    pageSize: ApiCardInfoWalmartGroupStatGetPageSizeEnum,
+    username?: string,
+    date?: string,
    options?: RawAxiosRequestConfig
  ) {
    return DefaultApiFp(this.configuration)
-      .apiCardInfoWalmartGroupStatGet(current, pageSize, options)
+      .apiCardInfoWalmartGroupStatGet(
+        current,
+        pageSize,
+        username,
+        date,
+        options
+      )
      .then(request => request(this.axios, this.basePath));
  }

--- a/src/api/generated/models/kami-api-card-info-walmart-v1-card-redeem-account-summary.ts
+++ b/src/api/generated/models/kami-api-card-info-walmart-v1-card-redeem-account-summary.ts
@@ -22,6 +22,12 @@ import type { KamiApiCardInfoWalmartV1AccountInfo } from './kami-api-card-info-w
 * @interface KamiApiCardInfoWalmartV1CardRedeemAccountSummary
 */
 export interface KamiApiCardInfoWalmartV1CardRedeemAccountSummary {
+  /**
+   *
+   * @type {number}
+   * @memberof KamiApiCardInfoWalmartV1CardRedeemAccountSummary
+   */
+  groupId?: number;
  /**
   *
   * @type {KamiApiCardInfoWalmartV1AccountInfo}
--- a/src/api/generated/models/kami-api-card-info-walmart-v1-group-stat-req.ts
+++ b/src/api/generated/models/kami-api-card-info-walmart-v1-group-stat-req.ts
@@ -30,6 +30,18 @@ export interface KamiApiCardInfoWalmartV1GroupStatReq {
   * @memberof KamiApiCardInfoWalmartV1GroupStatReq
   */
  pageSize: KamiApiCardInfoWalmartV1GroupStatReqPageSizeEnum;
+  /**
+   * 用户名
+   * @type {string}
+   * @memberof KamiApiCardInfoWalmartV1GroupStatReq
+   */
+  username?: string;
+  /**
+   * 日期
+   * @type {string}
+   * @memberof KamiApiCardInfoWalmartV1GroupStatReq
+   */
+  date?: string;
 }

 export const KamiApiCardInfoWalmartV1GroupStatReqPageSizeEnum = {
--- a/src/api/generated/models/kami-api-card-info-walmart-v1-v1-card-redeem-account-group-entity-account.ts
+++ b/src/api/generated/models/kami-api-card-info-walmart-v1-v1-card-redeem-account-group-entity-account.ts
@@ -36,16 +36,4 @@ export interface KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount {
   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount
   */
  unNormal?: number;
-  /**
-   *
-   * @type {number}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount
-   */
-  amount?: number;
-  /**
-   *
-   * @type {number}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount
-   */
-  count?: number;
 }
--- a/src/api/generated/models/kami-api-card-info-walmart-v1-v1-card-redeem-account-group-entity.ts
+++ b/src/api/generated/models/kami-api-card-info-walmart-v1-v1-card-redeem-account-group-entity.ts
@@ -22,54 +22,36 @@ import type { KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount } fr
 * @interface KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
 */
 export interface KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity {
+  /**
+   *
+   * @type {string}
+   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
+   */
+  orderDate?: string;
  /**
   *
   * @type {number}
   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
   */
-  id?: number;
-  /**
-   * 分组名称
-   * @type {string}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
-   */
-  name?: string;
-  /**
-   * 备注
-   * @type {string}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
-   */
-  notes?: string;
-  /**
-   * 分组类别
-   * @type {string}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
-   */
-  category?: string;
+  groupId?: number;
  /**
   *
   * @type {string}
   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
   */
-  createdUserId?: string;
+  groupName?: string;
  /**
   *
-   * @type {string}
+   * @type {number}
   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
   */
-  createdAt?: string;
+  count?: number;
  /**
   *
-   * @type {string}
+   * @type {number}
   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
   */
-  deletedAt?: string;
-  /**
-   *
-   * @type {string}
-   * @memberof KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
-   */
-  updatedAt?: string;
+  sum?: number;
  /**
   *
   * @type {KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntityAccount}
--- a/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts
+++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts
@@ -47,7 +47,7 @@ export interface KamiApiCardRedeemJdV1OrderListReq {
   * @type {string}
   * @memberof KamiApiCardRedeemJdV1OrderListReq
   */
-  status?: string;
+  status?: KamiApiCardRedeemJdV1OrderListReqStatusEnum;
 }

 export const KamiApiCardRedeemJdV1OrderListReqPageSizeEnum = {
@@ -61,3 +61,11 @@ export const KamiApiCardRedeemJdV1OrderListReqPageSizeEnum = {

 export type KamiApiCardRedeemJdV1OrderListReqPageSizeEnum =
  (typeof KamiApiCardRedeemJdV1OrderListReqPageSizeEnum)[keyof typeof KamiApiCardRedeemJdV1OrderListReqPageSizeEnum];
+export const KamiApiCardRedeemJdV1OrderListReqStatusEnum = {
+  Fail: 'fail',
+  Init: 'init',
+  Success: 'success'
+} as const;
+
+export type KamiApiCardRedeemJdV1OrderListReqStatusEnum =
+  (typeof KamiApiCardRedeemJdV1OrderListReqStatusEnum)[keyof typeof KamiApiCardRedeemJdV1OrderListReqStatusEnum];
--- a/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts
+++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts
@@ -1,5 +1,5 @@
 /* tslint:disable */
-
+/* eslint-disable */
 /**
 *
 * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
@@ -47,5 +47,14 @@ export interface KamiApiCardRedeemJdV1PlaceOrderRes {
   * @type {string}
   * @memberof KamiApiCardRedeemJdV1PlaceOrderRes
   */
-  orderStatus?: string;
+  orderStatus?: KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum;
 }
+
+export const KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum = {
+  Fail: 'fail',
+  Init: 'init',
+  Success: 'success'
+} as const;
+
+export type KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum =
+  (typeof KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum)[keyof typeof KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum];
--- a/src/views/card-walmart-info/group/summary.tsx
+++ b/src/views/card-walmart-info/group/summary.tsx
@@ -1,7 +1,9 @@
 import { apiClient } from '@/api';
 import type {
  KamiApiCardInfoWalmartV1CardRedeemAccountSummary,
-  ApiCardInfoWalmartAccountDailySummaryGetPageSizeEnum
+  ApiCardInfoWalmartAccountDailySummaryGetPageSizeEnum,
+  ApiCardInfoWalmartGroupStatGetPageSizeEnum,
+  KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity
 } from '@/api/generated';
 import { handleDownLoadFile } from '@/api/utils';
 import type { Pagination } from '@/types/global';
@@ -18,6 +20,7 @@ import {
  Row,
  Space,
  Table,
+  Tag,
  type TableColumnData
 } from '@arco-design/web-vue';
 import { defineComponent, onMounted, reactive, ref } from 'vue';
@@ -55,41 +58,42 @@ export default defineComponent({
        }
      },
      {
-        title: '用户名',
-        dataIndex: 'accountInfo.name'
+        title: '分组名称',
+        dataIndex: 'name'
      },
      {
-        title: '余额',
-        dataIndex: 'accountInfo.balance'
+        title: '账户情况',
+        dataIndex: 'account.accountInfo',
+        render(data) {
+          return (
+            <>
+              <span>
+                正常账户：
+                <Tag color='green' size='small'>
+                  {data.account.normal}
+                </Tag>
+                <br />
+                异常账户：
+                <Tag color='red' size='small'>
+                  {data.account.unnormal}
+                </Tag>
+              </span>
+            </>
+          );
+        }
      },
      {
-        title: '今日充值金额',
-        dataIndex: 'amountTodaySum'
+        title: '充值金额',
+        dataIndex: 'account.amount'
      },
      {
-        title: '今日充值次数',
-        dataIndex: 'amountTodayCount'
-      },
-      {
-        title: '累计充值金额',
-        dataIndex: 'amountTotalSum'
-      },
-      {
-        title: '累计充值次数',
-        dataIndex: 'amountTotalCount'
-      },
-      {
-        title: '上传人',
-        dataIndex: 'accountInfo.uploadUser.username'
-      },
-      {
-        title: '日期',
-        dataIndex: 'date'
+        title: '充值笔数',
+        dataIndex: 'account.count'
      }
    ];
-    const tableData = ref<KamiApiCardInfoWalmartV1CardRedeemAccountSummary[]>(
-      []
-    );
+    const tableData = ref<
+      KamiApiCardInfoWalmartV1V1CardRedeemAccountGroupEntity[]
+    >([]);

    const downloadExcel = () => {
      apiClient
@@ -111,20 +115,14 @@ export default defineComponent({
          handleDownLoadFile(res.data as any, '沃尔玛账户统计明细.xlsx');
        });
    };
-    const fetchData = (
-      page: Pagination = pagination,
-      params: IformData = formModel.value
-    ) => {
+    const fetchData = (page: Pagination = pagination) => {
      apiClient
-        .apiCardInfoWalmartAccountDailySummaryGet(
+        .apiCardInfoWalmartGroupStatGet(
          page.current,
-          page.pageSize as ApiCardInfoWalmartAccountDailySummaryGetPageSizeEnum,
-          params.username,
-          params.date
+          page.pageSize as ApiCardInfoWalmartGroupStatGetPageSizeEnum
        )
        .then(res => {
          tableData.value = res.data.list;
-          pagination.total = res.data.total;
        });
    };
    const reset = () => {