fix: 三期bug

zhengyiming

2025-03-25 174f774704bbab83061288522ec4fbdfba1f6716

 packages/services/api/typings.d.ts

@@ -15,6 +15,8 @@
    scope?: string;
  }

  type ACOOLYStatusEnum = 10 | 20 | 30 | 40 | 50 | 60;

  interface ActionApiDescriptionModel {
    uniqueName?: string;
    name?: string;
@@ -152,6 +154,10 @@
    moduleId?: string;
  }

  interface APIgetBillErceiptExportParams {
    orderNo?: string;
  }

  interface APIgetCountParams {
    filter?: string;
  }
@@ -174,6 +180,14 @@

  interface APIgetLifePayChannlesDtoParams {
    id?: string;
  }

  interface APIgetLifePayOrderDetailParams {
    orderNo?: string;
  }

  interface APIgetLifePayRefundOrderDetailParams {
    orderNo?: string;
  }

  interface APIgetLifePayWxIndentityParams {
@@ -412,6 +426,10 @@
    type?: number;
  }

  interface ChannelRateOutput {
    channlesRate?: number;
  }

  interface ChannelsBaseInput {
    pageModel?: Pagination;
    checkChannelId?: string;
@@ -444,11 +462,15 @@
    name?: string;
    /** 手机号 */
    phoneNumber?: string;
    /** 密码 */
    password?: string;
    /** 账户 */
    userName?: string;
    remark?: string;
    /** 角色 */
    roleNames?: string[];
    /** 渠道列表 */
    channlesId?: string[];
    /** 组织架构公司id */
    companyOrgId?: string;
    /** 组织架构部门id */
@@ -1052,6 +1074,67 @@
    lifePayOrderType?: LifePayOrderTypeEnum;
    /** 订单号 */
    orderNo?: string;
    /** 退款订单号 */
    refundOrderNo?: string;
    /** 充值金额 */
    rechargeAmount?: number;
    /** 实际充值金额 */
    actualRechargeAmount?: number;
    /** 优惠金额 */
    discountAmount?: number;
    /** 实付金额 */
    payAmount?: number;
    /** 支付时间 */
    payTime?: string;
    /** 平台扣款金额 */
    platformDeductionAmount?: number;
    payStatus?: LifePayStatusEnum;
    /** 外部订单号 */
    outOrderNo?: string;
    lifePayOrderStatus?: LifePayOrderStatusEnum;
    /** 完成时间 */
    finishTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    /** 退款金额 */
    refundPrice?: number;
    /** 下单时间 */
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
    /** 申请退款原因 */
    refundApplyRemark?: string;
    /** 退款申请时间 */
    refundApplyTime?: string;
    /** 驳回原因 */
    refundCheckRemark?: string;
    /** 供应商订单号 */
    acoolyOrderNo?: string;
    acoolyStatus?: ACOOLYStatusEnum;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    /** 实际到账金额 */
    actualReceivedAmount?: number;
    actualReceivedStatus?: LifePayStatusEnum;
  }

  interface LifePayOrderListOutputPageOutput {
    pageModel?: Pagination;
    objectData?: any;
    data?: LifePayOrderListOutput[];
  }

  interface LifePayOrderOutput {
    id?: string;
    /** 用户账号 */
    userPhoneNumber?: string;
    userName?: string;
    lifePayChannle?: string;
    lifePayType?: LifePayTypeEnum;
    lifePayOrderType?: LifePayOrderTypeEnum;
    /** 退款订单号 */
    refundOrderNo?: string;
    /** 订单号 */
    orderNo?: string;
    /** 充值金额 */
    rechargeAmount?: number;
    /** 优惠金额 */
@@ -1061,29 +1144,55 @@
    /** 支付时间 */
    payTime?: string;
    payStatus?: LifePayStatusEnum;
    /** 外部订单号 */
    outOrderNo?: string;
    lifePayOrderStatus?: LifePayOrderStatusEnum;
    status?: LifePayOrderStatusEnum;
    /** 完成时间 */
    finishTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    /** 外部订单号 */
    outOrderNo?: string;
    /** 订单详细数据 */
    orderParamDetailJsonStr?: string;
    /** 下单时间 */
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    /** 退款原因 */
    refundApplyRemark?: string;
    /** 驳回原因 */
    refundCheckRemark?: string;
    /** 渠道流水号 */
    acoolyOrderNo?: string;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    /** 实际充值金额 */
    actualRechargeAmount?: number;
    /** 实际到账金额 */
    actualReceivedAmount?: number;
    /** 退款金额 */
    refundPrice?: number;
    /** 平台折扣比例 */
    platformRate?: number;
    /** 平台扣款金额 */
    platformPrice?: number;
    /** 渠道折扣 */
    channleRate?: number;
    /** 渠道佣金比例 */
    channlesRakeRate?: number;
    /** 渠道佣金 */
    channlesRakePrice?: number;
    /** 手续费比例 */
    premiumRate?: number;
    /** 手续费 */
    premiumPrice?: number;
    /** 平台利润 */
    profit?: number;
    /** 回单地址 */
    elecBillUrl?: string;
    /** 退款回单地址 */
    refundElecBillUrl?: string;
  }

  interface LifePayOrderListOutputPageOutput {
    pageModel?: Pagination;
    objectData?: any;
    data?: LifePayOrderListOutput[];
  }

  type LifePayOrderStatusEnum = 10 | 20 | 30 | 40 | 50 | 60;
  type LifePayOrderStatusEnum = 10 | 20 | 30 | 40 | 50 | 60 | 70;

  type LifePayOrderTypeEnum = 10 | 20 | 30;

@@ -1120,7 +1229,64 @@

  type LifePayRateTypeEnum = 10 | 20 | 30 | 40;

  type LifePayStatusEnum = 10 | 20 | 30 | 40;
  interface LifePayRefundOrderOutput {
    id?: string;
    /** 用户账号 */
    userPhoneNumber?: string;
    userName?: string;
    lifePayChannle?: string;
    lifePayType?: LifePayTypeEnum;
    lifePayOrderType?: LifePayOrderTypeEnum;
    /** 订单号 */
    orderNo?: string;
    /** 充值金额 */
    rechargeAmount?: number;
    /** 优惠金额 */
    discountAmount?: number;
    /** 实付金额 */
    payAmount?: number;
    /** 支付时间 */
    payTime?: string;
    payStatus?: LifePayStatusEnum;
    status?: LifePayOrderStatusEnum;
    /** 完成时间 */
    finishTime?: string;
    /** 外部订单号 */
    outOrderNo?: string;
    /** 下单时间 */
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    /** 退款申请原因 */
    refundApplyRemark?: string;
    /** 退款申请时间 */
    refundApplyTime?: string;
    /** 退款驳回原因 */
    refundCheckRemark?: string;
    /** 退款订单号 */
    refundOrderNo?: string;
    /** 渠道流水号 */
    acoolyOrderNo?: string;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    /** 实际充值金额 */
    actualRechargeAmount?: number;
    /** 实际到账金额 */
    actualReceivedAmount?: number;
    /** 退款金额 */
    refundPrice?: number;
    /** 回单地址 */
    elecBillUrl?: string;
    /** 退款回单地址 */
    refundElecBillUrl?: string;
  }

  type LifePayRefundStatusEnum = 0 | 10 | 20 | 30 | 40;

  type LifePayRefundTypeEnum = 10 | 20;

  type LifePayStatusEnum = 10 | 20 | 30 | 40 | 50;

  type LifePaySwitchTypeEnum = 10 | 20 | 30;

@@ -1317,7 +1483,8 @@
    | 31
    | 32
    | 40
    | 42;
    | 42
    | 43;

  interface OrderInput {
    property?: string;
@@ -1444,11 +1611,39 @@
    /** 结束支付时间 */
    endPayTime?: string;
    payStatus?: LifePayStatusEnum;
    acoolyStatus?: ACOOLYStatusEnum;
    lifePayOrderStatus?: LifePayOrderStatusEnum;
    /** 开始完成时间 */
    beginFinishTime?: string;
    /** 结束完成时间 */
    endFinishTime?: string;
    /** 用户Id */
    userId?: string;
    /** 搜索关键词 */
    keyWords?: string;
  }

  interface QueryLifePayRefundOrderListInput {
    pageModel?: Pagination;
    checkChannelId?: string;
    lifePayOrderType?: LifePayOrderTypeEnum;
    lifePayType?: LifePayTypeEnum;
    /** 开始申请退款时间 */
    beginRefundApplyTime?: string;
    /** 结束申请退款时间 */
    endRefundApplyTime?: string;
    /** 开始完成时间 */
    beginFinishTime?: string;
    /** 结束完成时间 */
    endFinishTime?: string;
    /** 开始退款时间 */
    beginRefundTime?: string;
    /** 结束退款时间 */
    endRefundTime?: string;
    payStatus?: LifePayStatusEnum;
    acoolyStatus?: ACOOLYStatusEnum;
    lifePayOrderStatus?: LifePayOrderStatusEnum;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    /** 用户Id */
    userId?: string;
    /** 搜索关键词 */
@@ -1477,10 +1672,25 @@
    lifePayOrderType?: LifePayOrderTypeEnum;
  }

  interface QueryUserPageInput {
    pageModel?: Pagination;
    checkChannelId?: string;
    /** 手机号/用户名 */
    queryCondition?: string;
    /** 注册时间 */
    creationTimeBegin?: string;
    creationTimeEnd?: string;
  }

  interface RefundLifePayOrderInput {
    id?: string;
    /** 上传凭证 */
    refundCredentialsImgUrl?: string;
    /** 退款驳回原因 */
    refundCheckRemark?: string;
    lifePayRefundType?: LifePayRefundTypeEnum;
    /** 退款金额 */
    refundPrice?: number;
  }

  interface RefundUserLifePayOrderInput {
@@ -1516,6 +1726,11 @@
  interface RemoteServiceValidationErrorInfo {
    message?: string;
    members?: string[];
  }

  interface ResetPasswordBaseInput {
    userId?: string;
    password?: string;
  }

  interface ResetPasswordDto {
@@ -1652,6 +1867,31 @@
    timeZone?: TimeZone;
  }

  interface TopStatisticsOutput {
    /** 创建时间 */
    creationTime?: string;
    /** 账户余额 */
    amount?: number;
    /** 累计收款 */
    accumulatedReceipts?: number;
    /** 昨日收款 */
    receiptsYesterday?: number;
    /** 累计收入 */
    accumulatedIncome?: number;
    /** 累计下单 */
    accumulatedOrders?: number;
    /** 昨日下单 */
    ordersNumYesterday?: number;
    /** 昨日成功 */
    yesterdaySuccess?: number;
    /** 昨日失败 */
    yesterdayFail?: number;
    /** 累计用户 */
    accumulatedUsers?: number;
    /** 昨日活跃用户 */
    yesterdayActiveUsers?: number;
  }

  interface TypeApiDescriptionModel {
    baseType?: string;
    isEnum?: boolean;
@@ -1666,11 +1906,15 @@
    name?: string;
    /** 手机号 */
    phoneNumber?: string;
    /** 密码 */
    password?: string;
    /** 账户 */
    userName?: string;
    remark?: string;
    /** 角色 */
    roleNames?: string[];
    /** 渠道列表 */
    channlesId?: string[];
    /** 组织架构公司id */
    companyOrgId?: string;
    /** 组织架构部门id */
@@ -1743,6 +1987,13 @@
    data?: UserAccountOutput[];
  }

  interface UserChannleDto {
    /** 渠道Id */
    id?: string;
    /** 渠道名 */
    name?: string;
  }

  interface UserData {
    id?: string;
    tenantId?: string;
@@ -1778,6 +2029,8 @@
    isLocked?: boolean;
    /** 角色信息 */
    roles?: RoleDto[];
    /** 角色信息 */
    channles?: UserChannleDto[];
    /** 备注 */
    remark?: string;
    /** 组织架构公司id */
@@ -1816,12 +2069,16 @@
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
    /** 退款申请时间 */
    refundApplyTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    refundApplyRemark?: string;
    refundCheckRemark?: string;
    /** 渠道流水号 */
    acoolyOrderNo?: string;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    acoolyStatus?: ACOOLYStatusEnum;
  }

  interface UserLifePayOrderOutputPageOutput {
@@ -1846,6 +2103,12 @@
    id?: string;
    /** 用户手机号 */
    phoneNumber?: string;
    /** 姓名 */
    name?: string;
    /** 最后登录渠道 */
    creationChannle?: string;
    /** 最后登录渠道 */
    lastLoginChannle?: string;
    lastLoginTime?: string;
    creationTime?: string;
  }