Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

zhengyiming

1 天以前 eb23fb1d477a480c773dc52c6d47f1b901d09d17

Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp

 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
                }
            ]
        }

 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年M月"
            :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年M月'),
  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}`,

 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">

 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>


 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;

 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',

 packages/components/src/List/IncomeDetailListItem.vue

@@ -22,7 +22,7 @@

type Props = {
  title?: string;
  funds?: string;
  funds?: number;
  item?: string;
  value?: string;
  showValue?: boolean;

 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 {
  /**待确认 */

 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 这个状态UserAttestationStatus
 */
export enum UserBasicInfoStatus {
  /**
   * 待审核
   */
  Audit = 0,
  /**
   * 注册用户
   */
  Registered = 1,
  /**
   * 基础信息完善用户
   */
  BasicInfoPerfect = 2,
  /**
   * 提交审核
   */
  SubmitAudit = 9,
  /**
   * 通过
   */
  Pass = 10,
  /**
   * 驳回
   */
  Reject = -10,
  /**
   * 禁用
   */
  Disable = -20,
  /**
   * 未认证
   */
  NotAttestation = -30,
}

/**
 * @deprecated 这个状态ParkOrHRStatus
 */
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]: '提现',
};

 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 || {}),
  });
}

 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;
  }


 packages/services/apiV2/user.ts

@@ -70,6 +70,42 @@
  );
}

/** 查询个人用户收支明细详情 GET /api/user/user/getPersonalUserTransaction */
export async function getPersonalUserTransaction(
  // 叠加生成的Param类型 (非body参数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(
  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)