From eb23fb1d477a480c773dc52c6d47f1b901d09d17 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 10 九月 2025 15:13:20 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

---
 packages/services/apiV2/enterpriseWallet.ts                         |   15 -
 packages/components/src/List/IncomeDetailListItem.vue               |    2 
 apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue     |   58 +++--
 packages/components/src/Card/BusinessCardHolderCard.vue             |    4 
 packages/services/apiV2/typings.d.ts                                |  151 ++++++++++++++--
 apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue       |    4 
 packages/components/src/Card/FlexJobCard.vue                        |    2 
 packages/constants/user.ts                                          |  148 ----------------
 apps/cMiniApp/project.private.config.json                           |   14 
 apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue |   52 ++++-
 packages/constants/apiEnum.ts                                       |   40 ++-
 packages/services/apiV2/user.ts                                     |   36 ++++
 12 files changed, 280 insertions(+), 246 deletions(-)

diff --git a/apps/cMiniApp/project.private.config.json b/apps/cMiniApp/project.private.config.json
index 4f09a5f..35ce4dc 100644
--- a/apps/cMiniApp/project.private.config.json
+++ b/apps/cMiniApp/project.private.config.json
@@ -10,13 +10,6 @@
         "miniprogram": {
             "list": [
                 {
-                    "name": "subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail",
-                    "pathName": "subpackages/mine/mineAgreementSignDetail/mineAgreementSignDetail",
-                    "query": "scene=66688",
-                    "launchMode": "default",
-                    "scene": 1047
-                },
-                {
                     "name": "瀹炲悕璁よ瘉",
                     "pathName": "subpackages/authentication/authenticationRealName/authenticationRealName",
                     "query": "type=realName",
@@ -92,6 +85,13 @@
                     "query": "",
                     "launchMode": "default",
                     "scene": null
+                },
+                {
+                    "name": "",
+                    "pathName": "subpackages/wallet/mineWallet/mineWallet",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
                 }
             ]
         }
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
index 1c9c45c..8693177 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetail/InnerPage.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- <ProTabs
-    v-model="queryState.status"
+    v-model="queryState.type"
     name="home-tab"
     :showPaneContent="false"
     class="home-tabs"
@@ -9,18 +9,18 @@
     title-scroll
   >
     <ProTabPane :title="`鍏ㄩ儴`" :pane-key="0"></ProTabPane>
-    <ProTabPane :title="`鏀跺叆`" :pane-key="1"></ProTabPane>
-    <ProTabPane :title="`鎻愮幇`" :pane-key="2"></ProTabPane>
+    <ProTabPane :title="`鏀跺叆`" :pane-key="EnumUserWalletTransactionType.Income"></ProTabPane>
+    <ProTabPane :title="`鎻愮幇`" :pane-key="EnumUserWalletTransactionType.Withdraw"></ProTabPane>
   </ProTabs> -->
   <List>
-    <IncomeDetailListItem :item="`鏀跺叆锛氾骏${toThousand(100)} 鎻愮幇锛氾骏${toThousand(200)}`">
+    <IncomeDetailListItem :item="`鏀跺叆锛氾骏${toThousand(sumIncome)} `">
       <template #title>
         <div class="income-detail-time-picker">
           <ChooseInputWithDatePicker
             v-model="queryState.month"
             type="year-month"
-            format="YYYY骞碝鏈�"
             :max-date="nowDate"
+            format="YYYY-MM"
           />
           <IconFont name="triangle-down" class="income-detail-time-picker-icon"></IconFont>
         </div>
@@ -30,15 +30,15 @@
   <InfiniteLoading
     scrollViewClassName="common-infinite-scroll-list home-list"
     v-bind="infiniteLoadingProps"
-    :key="queryState.status"
+    :key="queryState.type"
   >
     <template #renderItem="{ item }">
       <IncomeDetailListItem
-        :title="'鏀跺叆-瀹佹尝浜哄姏鏃犲咖'"
-        :funds="'+300.00'"
-        :item="'2024.12.20 13:30:30'"
-        :value="'閽卞寘浣欓锛�300.00'"
-        @click="goIncomeDetailInfo()"
+        :title="item.title"
+        :funds="item.amount"
+        :item="dayjs(item.createdTime).format('YYYY-MM-DD HH:mm:ss')"
+        :value="`閽卞寘浣欓锛�${toThousand(item.balance)}`"
+        @click="goIncomeDetailInfo(item)"
       >
       </IncomeDetailListItem>
     </template>
@@ -53,51 +53,61 @@
   ProTabs,
   ProTabPane,
 } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
 import { IconFont } from '@nutui/icons-vue-taro';
 import Taro from '@tarojs/taro';
 import dayjs from 'dayjs';
 import { useInfiniteLoading } from '@12333/hooks';
-import { EnumPagedListOrder } from '@12333/constants';
+import { EnumPagedListOrder, EnumUserWalletTransactionType } from '@12333/constants';
 import { toThousand } from '@12333/utils';
-import * as taskServices from '@12333/services/apiV2/task';
+import * as userServices from '@12333/services/apiV2/user';
 
 defineOptions({
   name: 'InnerPage',
 });
 
-const userStore = useUserStore();
 const nowDate = dayjs().toDate();
 
 const queryState = reactive({
-  month: dayjs().format('YYYY骞碝鏈�'),
-  status: 0,
+  month: dayjs().format('YYYY-MM'),
+  type: 0 as any as EnumUserWalletTransactionType,
+});
+
+const sumIncome = computed(() => {
+  return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.sumIncome ?? 0;
+});
+const sumWithdraw = computed(() => {
+  return infiniteLoadingProps.value?.listData?.pages?.[0]?.objectData?.sumWithdraw ?? 0;
 });
 
 const { infiniteLoadingProps } = useInfiniteLoading(
   ({ pageParam }) => {
-    let params: API.GetPersonalApplyTaskInfosQuery = {
+    let params: API.GetPersonalUserTransactionsQuery = {
       pageModel: {
         rows: 20,
         page: pageParam,
         orderInput: [{ property: 'id', order: EnumPagedListOrder.Desc }],
       },
+      type: EnumUserWalletTransactionType.Income,
     };
-    if (Number(queryState.status)) {
-      params.status = queryState.status;
+    // if (Number(queryState.type)) {
+    //   params.type = queryState.type;
+    // }
+    if (queryState.month) {
+      params.createdTimeStart = dayjs(queryState.month).startOf('month').format('YYYY-MM-DD');
+      params.createdTimeEnd = dayjs(queryState.month).endOf('month').format('YYYY-MM-DD');
     }
-    return taskServices.getPersonalApplyTaskInfos(params, {
+    return userServices.getPersonalUserTransactions(params, {
       showLoading: false,
     });
   },
   {
-    queryKey: ['taskServices/getPersonalApplyTaskInfos', queryState],
+    queryKey: ['userServices/getPersonalUserTransactions', queryState],
   }
 );
 
-function goIncomeDetailInfo(row?) {
+function goIncomeDetailInfo(row: API.GetPersonalUserTransactionsQueryResultItem) {
   Taro.navigateTo({
-    url: `${RouterPath.incomeDetailInfo}`,
+    url: `${RouterPath.incomeDetailInfo}?id=${row.id}`,
   });
   // Taro.navigateTo({
   //   url: `${RouterPath.withdrawDetailInfo}`,
diff --git a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
index dfecbca..ef538f4 100644
--- a/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/incomeDetailInfo/InnerPage.vue
@@ -1,29 +1,34 @@
 <template>
-  <WithdrawMoneyCard :money="100" title="鏀跺叆"></WithdrawMoneyCard>
+  <WithdrawMoneyCard
+    :money="100"
+    :title="EnumUserWalletTransactionTypeText[detail.type]"
+  ></WithdrawMoneyCard>
   <List>
     <ListItem title="娴佹按鍙�" :show-arrow="false">
       <template #extra>
-        <div class="income-detail-info-value">{{ '5893485943859843095843' }}</div>
+        <div class="income-detail-info-value">{{ detail?.code }}</div>
       </template>
     </ListItem>
     <ListItem title="浼佷笟鍚嶇О" :show-arrow="false">
       <template #extra>
-        <div class="income-detail-info-value">{{ '瀹佹尝浜哄姏鏃犲咖' }}</div>
+        <div class="income-detail-info-value">{{ detail?.enterpriseName }}</div>
       </template>
     </ListItem>
     <ListItem title="缁撶畻鏃ユ湡" :show-arrow="false">
       <template #extra>
-        <div class="income-detail-info-value">{{ '2024.11.13' }}</div>
+        <div class="income-detail-info-value">
+          {{ dayjs(detail?.settlementTime).format('YYYY-MM-DD') }}
+        </div>
       </template>
     </ListItem>
-    <ListItem title="宸ヨ祫鍗曞唴瀹�" :show-arrow="false">
+    <ListItem title="缁撶畻閲戦" :show-arrow="false">
       <template #extra>
-        <div class="income-detail-info-value">{{ '33.33鍏�' }}</div>
+        <div class="income-detail-info-value">{{ toThousand(detail?.settlementAmount) }}</div>
       </template>
     </ListItem>
-    <ListItem title="宸ヨ祫鍗曞唴瀹�" :show-arrow="false">
+    <ListItem title="瀹炲彂閲戦" :show-arrow="false">
       <template #extra>
-        <div class="income-detail-info-value">{{ '33.33鍏�' }}</div>
+        <div class="income-detail-info-value">{{ toThousand(detail?.amount) }}</div>
       </template>
     </ListItem>
   </List>
@@ -31,13 +36,40 @@
 
 <script setup lang="ts">
 import { List, ListItem, WithdrawMoneyCard } from '@12333/components';
-import { useUserStore } from '@/stores/modules/user';
+import { EnumUserWalletTransactionType, EnumUserWalletTransactionTypeText } from '@12333/constants';
+import Taro from '@tarojs/taro';
+import * as userServices from '@12333/services/apiV2/user';
+import { useQuery } from '@tanstack/vue-query';
+import dayjs from 'dayjs';
+import { toThousand } from '@12333/utils';
 
 defineOptions({
   name: 'InnerPage',
 });
 
-const userStore = useUserStore();
+const router = Taro.useRouter();
+const id = router.params?.id;
+
+const {
+  isLoading,
+  isError,
+  data: detail,
+  refetch,
+} = useQuery({
+  queryKey: ['userServices/getPersonalUserTransaction', id],
+  queryFn: async () => {
+    return await userServices.getPersonalUserTransaction(
+      { id: id },
+      {
+        showLoading: false,
+      }
+    );
+  },
+  placeholderData: () => ({} as API.GetPersonalUserTransactionQueryResult),
+  onSuccess(data) {
+    // if (data.isExistTradeChatRecord) setTrue();
+  },
+});
 </script>
 
 <style lang="scss">
diff --git a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
index d633350..894746e 100644
--- a/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
+++ b/apps/cMiniApp/src/subpackages/wallet/mineWallet/InnerPage.vue
@@ -5,13 +5,13 @@
   </div> -->
   <List>
     <ListItem title="鏀跺叆鏄庣粏" @click="goIncomeDetail"> </ListItem>
-    <ListItem title="鏀粯瀹濊处鎴�" @click="goWithdraw">
+    <!-- <ListItem title="鏀粯瀹濊处鎴�" @click="goWithdraw">
       <template #extra>
         <div class="bind-bank-card">
           {{ isBinding ? '宸茬粦瀹�' : '鏈粦瀹氥�佺珛鍗崇粦瀹�' }}
         </div>
       </template>
-    </ListItem>
+    </ListItem> -->
   </List>
 </template>
 
diff --git a/packages/components/src/Card/BusinessCardHolderCard.vue b/packages/components/src/Card/BusinessCardHolderCard.vue
index 72cc153..17b620a 100644
--- a/packages/components/src/Card/BusinessCardHolderCard.vue
+++ b/packages/components/src/Card/BusinessCardHolderCard.vue
@@ -27,9 +27,9 @@
 </template>
 
 <script setup lang="ts">
+import { EnumUserGender } from '@12333/constants';
 import { CommonTaskCardProps } from './card';
 import FlexJobTopView from './FlexJobTopView.vue';
-import { Gender } from '@12333/constants';
 
 defineOptions({
   name: 'BusinessCardHolderCard',
@@ -41,7 +41,7 @@
   showDoneDetail?: boolean;
 
   name?: string;
-  genderType?: Gender;
+  genderType?: EnumUserGender;
   age?: number;
   isRealName?: boolean;
   educationalLevel?: string;
diff --git a/packages/components/src/Card/FlexJobCard.vue b/packages/components/src/Card/FlexJobCard.vue
index ec87470..006a2d1 100644
--- a/packages/components/src/Card/FlexJobCard.vue
+++ b/packages/components/src/Card/FlexJobCard.vue
@@ -40,7 +40,7 @@
 <script setup lang="ts">
 import { CommonTaskCardProps } from './card';
 import FlexJobTopView from './FlexJobTopView.vue';
-import { EnumUserGender, Gender } from '@12333/constants';
+import { EnumUserGender } from '@12333/constants';
 
 defineOptions({
   name: 'FlexJobCard',
diff --git a/packages/components/src/List/IncomeDetailListItem.vue b/packages/components/src/List/IncomeDetailListItem.vue
index b53e501..9a0028b 100644
--- a/packages/components/src/List/IncomeDetailListItem.vue
+++ b/packages/components/src/List/IncomeDetailListItem.vue
@@ -22,7 +22,7 @@
 
 type Props = {
   title?: string;
-  funds?: string;
+  funds?: number;
   item?: string;
   value?: string;
   showValue?: boolean;
diff --git a/packages/constants/apiEnum.ts b/packages/constants/apiEnum.ts
index efed8bd..c852ec0 100644
--- a/packages/constants/apiEnum.ts
+++ b/packages/constants/apiEnum.ts
@@ -167,22 +167,6 @@
   Stop = 999,
 }
 
-/** 浼佷笟閽卞寘浜ゆ槗鐘舵�� */
-export enum EnumEnterpriseWalletTransactionStatus {
-  /**寰呮彁浜� */
-  WaitSubmit = 1,
-  /**寰呮敮浠� */
-  WaitPay = 10,
-  /**澶勭悊涓� */
-  Dealing = 20,
-  /**鎴愬姛 */
-  Success = 30,
-  /**閫�绁� */
-  Refund = 40,
-  /**澶辫触 */
-  Fail = 50,
-}
-
 /** 浼佷笟閽卞寘浜ゆ槗绫诲瀷 */
 export enum EnumEnterpriseWalletTransactionType {
   /**鍏呭�� */
@@ -511,6 +495,30 @@
   Operation = 100,
 }
 
+/** 鐢ㄦ埛閽卞寘鏀舵敮绫诲瀷 */
+export enum EnumUserWalletTransactionType {
+  /**鏀跺叆 */
+  Income = 10,
+  /**鎻愮幇 */
+  Withdraw = 20,
+}
+
+/** 閽卞寘浜ゆ槗鐘舵�� */
+export enum EnumWalletTransactionStatus {
+  /**寰呮彁浜� */
+  WaitSubmit = 1,
+  /**寰呮敮浠� */
+  WaitPay = 10,
+  /**澶勭悊涓� */
+  Dealing = 20,
+  /**鎴愬姛 */
+  Success = 30,
+  /**閫�绁� */
+  Refund = 40,
+  /**澶辫触 */
+  Fail = 50,
+}
+
 /** 鎴戠殑鎶ュ悕鍒嗛〉鍒楄〃-鐘舵�� */
 export enum GetPersonalApplyTaskInfosQueryStatus {
   /**寰呯‘璁� */
diff --git a/packages/constants/user.ts b/packages/constants/user.ts
index f1af5ad..9c753b3 100644
--- a/packages/constants/user.ts
+++ b/packages/constants/user.ts
@@ -1,146 +1,6 @@
-import { Colors } from './enum';
+import { EnumUserWalletTransactionType } from './apiEnum';
 
-export enum UserAttestationStatus {
-  /**
-   * 寰呭鏍�
-   */
-  Audit = 0,
-  /**
-   * 娉ㄥ唽鐢ㄦ埛
-   */
-  Registered = 1,
-  /**
-   * 鍩虹淇℃伅瀹屽杽鐢ㄦ埛
-   */
-  BasicInfoPerfect = 2,
-  /**
-   * 鎻愪氦瀹℃牳
-   */
-  SubmitAudit = 9,
-  /**
-   * 閫氳繃
-   */
-  Pass = 10,
-  /**
-   * 椹冲洖
-   */
-  Reject = -10,
-  /**
-   * 鏈彁浜�/绂佺敤
-   */
-  NotSubmit = -20,
-  /**
-   * 鏈璇�
-   */
-  NotAttestation = -30,
-  /**
-   * 宸茶繃鏈�
-   */
-  Expired = -40,
-}
-
-export const UserAttestationStatusText = {
-  [UserAttestationStatus.SubmitAudit]: '璁よ瘉瀹℃牳涓�',
-  [UserAttestationStatus.Pass]: '宸茶璇�',
-  [UserAttestationStatus.Reject]: '瀹℃牳鏈�氳繃',
-  [UserAttestationStatus.NotAttestation]: '鏈璇�',
-  [UserAttestationStatus.Expired]: '宸茶繃鏈�',
-};
-
-export const UserAttestationStatusColor = {
-  [UserAttestationStatus.SubmitAudit]: Colors.Warning,
-  [UserAttestationStatus.Pass]: Colors.Success,
-  [UserAttestationStatus.Reject]: Colors.Danger,
-  [UserAttestationStatus.Expired]: Colors.Danger,
-};
-
-export const UserAttestationStatusClassName = {
-  [UserAttestationStatus.NotSubmit]: 'not-authorize',
-  [UserAttestationStatus.Reject]: 'authorize-reject',
-  [UserAttestationStatus.Audit]: 'authorizing',
-  [UserAttestationStatus.Pass]: 'authorized',
-};
-
-export enum UserType {
-  /**
-   * 浼佷笟
-   */
-  Enterprise = 1,
-  /**
-   * 涓汉
-   */
-  Person,
-}
-
-export const UserTypeText = {
-  [UserType.Enterprise]: '浼佷笟',
-  [UserType.Person]: '涓汉',
-};
-
-/**
- * @deprecated 杩欎釜鐘舵�乁serAttestationStatus
- */
-export enum UserBasicInfoStatus {
-  /**
-   * 寰呭鏍�
-   */
-  Audit = 0,
-  /**
-   * 娉ㄥ唽鐢ㄦ埛
-   */
-  Registered = 1,
-  /**
-   * 鍩虹淇℃伅瀹屽杽鐢ㄦ埛
-   */
-  BasicInfoPerfect = 2,
-  /**
-   * 鎻愪氦瀹℃牳
-   */
-  SubmitAudit = 9,
-  /**
-   * 閫氳繃
-   */
-  Pass = 10,
-  /**
-   * 椹冲洖
-   */
-  Reject = -10,
-  /**
-   * 绂佺敤
-   */
-  Disable = -20,
-  /**
-   * 鏈璇�
-   */
-  NotAttestation = -30,
-}
-
-/**
- * @deprecated 杩欎釜鐘舵�丳arkOrHRStatus
- */
-export enum OpenHRSiteStatus {
-  /**
-   * 鏈紑閫氫汉璧勫叕鍙�
-   */
-  NotOpen = 0,
-  /**
-   * 鏈彁浜や俊鎭�
-   */
-  Unsubmitted = 10,
-}
-
-export enum Gender {
-  /**
-   * 鐢�
-   */
-  Male = 1,
-  /**
-   * 濂�
-   */
-  Female = 2,
-}
-
-export const GenderText = {
-  [Gender.Male]: '鐢�',
-  [Gender.Female]: '濂�',
+export const EnumUserWalletTransactionTypeText = {
+  [EnumUserWalletTransactionType.Income]: '鏀跺叆',
+  [EnumUserWalletTransactionType.Withdraw]: '鎻愮幇',
 };
diff --git a/packages/services/apiV2/enterpriseWallet.ts b/packages/services/apiV2/enterpriseWallet.ts
index b03ba6d..f47a980 100644
--- a/packages/services/apiV2/enterpriseWallet.ts
+++ b/packages/services/apiV2/enterpriseWallet.ts
@@ -310,18 +310,3 @@
     }
   );
 }
-
-/** 浼佷笟閽卞寘杞处 POST /api/user/enterpriseWallet/transferEnterpriseWallet */
-export async function transferEnterpriseWallet(
-  body: API.TransferEnterpriseWalletCommand,
-  options?: API.RequestConfig
-) {
-  return request<string>('/api/user/enterpriseWallet/transferEnterpriseWallet', {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json-patch+json',
-    },
-    data: body,
-    ...(options || {}),
-  });
-}
diff --git a/packages/services/apiV2/typings.d.ts b/packages/services/apiV2/typings.d.ts
index eab48c6..9b6c5a9 100644
--- a/packages/services/apiV2/typings.d.ts
+++ b/packages/services/apiV2/typings.d.ts
@@ -170,6 +170,11 @@
     request?: GetPersonalUserRealResultQuery;
   }
 
+  interface APIgetPersonalUserTransactionParams {
+    /** 鏀舵敮Id */
+    id?: string;
+  }
+
   interface APIgetResourceFieldsParams {
     /** Id */
     id?: string;
@@ -641,21 +646,6 @@
     Stop = 999,
   }
 
-  enum EnumEnterpriseWalletTransactionStatus {
-    /**寰呮彁浜� */
-    WaitSubmit = 1,
-    /**寰呮敮浠� */
-    WaitPay = 10,
-    /**澶勭悊涓� */
-    Dealing = 20,
-    /**鎴愬姛 */
-    Success = 30,
-    /**閫�绁� */
-    Refund = 40,
-    /**澶辫触 */
-    Fail = 50,
-  }
-
   enum EnumEnterpriseWalletTransactionType {
     /**鍏呭�� */
     Recharge = 10,
@@ -952,6 +942,28 @@
     Enterprise = 20,
     /**杩愯惀 */
     Operation = 100,
+  }
+
+  enum EnumUserWalletTransactionType {
+    /**鏀跺叆 */
+    Income = 10,
+    /**鎻愮幇 */
+    Withdraw = 20,
+  }
+
+  enum EnumWalletTransactionStatus {
+    /**寰呮彁浜� */
+    WaitSubmit = 1,
+    /**寰呮敮浠� */
+    WaitPay = 10,
+    /**澶勭悊涓� */
+    Dealing = 20,
+    /**鎴愬姛 */
+    Success = 30,
+    /**閫�绁� */
+    Refund = 40,
+    /**澶辫触 */
+    Fail = 50,
   }
 
   interface ExportTaskCheckReceiveTaskUsersCommand {
@@ -1634,6 +1646,42 @@
     /** 閿欒鐮� */
     errorCode?: string;
     data?: GetPersonalUserRealResultQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionQueryResult;
+    /** 鎵ц鎴愬姛 */
+    success?: boolean;
+    /** 閿欒淇℃伅 */
+    msg?: any;
+    /** 闄勫姞鏁版嵁 */
+    extras?: any;
+    /** 鏃堕棿鎴� */
+    timestamp?: number;
+  }
+
+  interface FriendlyResultGetPersonalUserTransactionsQueryResult {
+    /** 璺熻釜Id */
+    traceId?: string;
+    /** 鐘舵�佺爜 */
+    code?: number;
+    /** 閿欒鐮� */
+    errorCode?: string;
+    data?: GetPersonalUserTransactionsQueryResult;
     /** 鎵ц鎴愬姛 */
     success?: boolean;
     /** 閿欒淇℃伅 */
@@ -3318,7 +3366,7 @@
     remark?: string;
     /** 璁㈠崟鏀粯鏃堕棿 */
     transDate?: string;
-    transactionStatus?: EnumEnterpriseWalletTransactionStatus;
+    transactionStatus?: EnumWalletTransactionStatus;
   }
 
   interface GetExceptionLogsQuery {
@@ -3903,6 +3951,66 @@
     faceRealUrl?: string;
   }
 
+  interface GetPersonalUserTransactionQueryResult {
+    /** 鏀舵敮Id */
+    id?: string;
+    type?: EnumUserWalletTransactionType;
+    /** 璁㈠崟鍙� */
+    code?: string;
+    /** 浼佷笟鍚嶇О */
+    enterpriseName?: string;
+    /** 缁撶畻鏃ユ湡 */
+    settlementTime?: string;
+    /** 缁撶畻閲戦 */
+    settlementAmount?: number;
+    /** 瀹炲彂閲戦/鎻愮幇閲戦 */
+    amount?: number;
+    /** 鏀舵浜哄鍚� */
+    receiveName?: string;
+    /** 鏀舵璐︽埛 */
+    receiveAccount?: string;
+    /** 鏈嶅姟璐� */
+    serviceFee?: number;
+    /** 瀹為檯鍒拌处 */
+    actualAmount?: number;
+  }
+
+  interface GetPersonalUserTransactionsQuery {
+    /** 鍒涘缓鏃堕棿-璧峰 */
+    createdTimeStart?: string;
+    /** 鍒涘缓鏃堕棿-鎴 */
+    createdTimeEnd?: string;
+    type?: EnumUserWalletTransactionType;
+    pageModel?: PagedListQueryPageModel;
+  }
+
+  interface GetPersonalUserTransactionsQueryResult {
+    objectData?: GetPersonalUserTransactionsQueryResultObjectData;
+    pageModel?: PagedListQueryResultPageModel;
+    /** 鏁版嵁 */
+    data?: GetPersonalUserTransactionsQueryResultItem[];
+  }
+
+  interface GetPersonalUserTransactionsQueryResultItem {
+    /** 鏀舵敮Id */
+    id?: string;
+    /** 鏍囬 */
+    title?: string;
+    /** 鍒涘缓鏃堕棿 */
+    createdTime?: string;
+    /** 閲戦 */
+    amount?: number;
+    /** 浣欓 */
+    balance?: number;
+  }
+
+  interface GetPersonalUserTransactionsQueryResultObjectData {
+    /** 鎬绘敹鍏� */
+    sumIncome?: number;
+    /** 鎬绘彁鐜� */
+    sumWithdraw?: number;
+  }
+
   interface GetResourceFieldsQueryResultItem {
     /** 缂栧彿 */
     code?: string;
@@ -4124,6 +4232,7 @@
   }
 
   interface GetSettlementTaskUsersQueryResult {
+    detail?: GetSettlementTaskQueryResult;
     /** 缁撶畻鍚嶅崟 */
     data?: GetSettlementTaskUsersQueryResultItem[];
     /** 閿欒淇℃伅 */
@@ -5367,6 +5476,8 @@
   interface SendInviteElectronSignSmsCommand {
     /** Id */
     ids?: string[];
+    /** 鍚堝悓妯℃澘Id */
+    contractTemplateId?: string;
   }
 
   interface SendLoginOrRegisterVerifyCodeCommand {
@@ -5646,14 +5757,6 @@
     industrialParkIds?: string[];
     status?: EnumUserStatus;
     /** 澶囨敞 */
-    remark?: string;
-  }
-
-  interface TransferEnterpriseWalletCommand {
-    access?: EnumEnterpriseWalletAccess;
-    /** 閲戦 */
-    amount?: number;
-    /** 鍏呭�煎娉� */
     remark?: string;
   }
 
diff --git a/packages/services/apiV2/user.ts b/packages/services/apiV2/user.ts
index 99c7719..5ea222a 100644
--- a/packages/services/apiV2/user.ts
+++ b/packages/services/apiV2/user.ts
@@ -70,6 +70,42 @@
   );
 }
 
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏璇︽儏 GET /api/user/user/getPersonalUserTransaction */
+export async function getPersonalUserTransaction(
+  // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)
+  params: API.APIgetPersonalUserTransactionParams,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionQueryResult>(
+    '/api/user/user/getPersonalUserTransaction',
+    {
+      method: 'GET',
+      params: {
+        ...params,
+      },
+      ...(options || {}),
+    }
+  );
+}
+
+/** 鏌ヨ涓汉鐢ㄦ埛鏀舵敮鏄庣粏鍒嗛〉鍒楄〃鏁版嵁 POST /api/user/user/getPersonalUserTransactions */
+export async function getPersonalUserTransactions(
+  body: API.GetPersonalUserTransactionsQuery,
+  options?: API.RequestConfig
+) {
+  return request<API.GetPersonalUserTransactionsQueryResult>(
+    '/api/user/user/getPersonalUserTransactions',
+    {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json-patch+json',
+      },
+      data: body,
+      ...(options || {}),
+    }
+  );
+}
+
 /** 鏌ヨ鐢ㄦ埛瑙掕壊鍒楄〃 GET /api/user/user/getUserInfoRoles */
 export async function getUserInfoRoles(
   // 鍙犲姞鐢熸垚鐨凱aram绫诲瀷 (闈瀊ody鍙傛暟swagger榛樿娌℃湁鐢熸垚瀵硅薄)

--
Gitblit v1.9.1