fix: 三期bug

zhengyiming

2025-03-25 174f774704bbab83061288522ec4fbdfba1f6716

fix: 三期bug

 packages/components/src/utils/common.ts

@@ -155,13 +155,13 @@
  lifePayOrderStatus?: LifeRechargeConstants.LifePayOrderStatusEnum,
  lifePayRefundStatus?: LifeRechargeConstants.LifePayRefundStatusEnum
) {
  if (
    (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.充值中 &&
      payStatus === LifeRechargeConstants.LifePayStatusEnum.已支付) ||
    payStatus === LifeRechargeConstants.LifePayStatusEnum.待退款
  ) {
    return LifeRechargeConstants.LifePayOrderFrontStatusEnum.支付成功;
  }
  // if (
  //   (lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.充值中 &&
  //     payStatus === LifeRechargeConstants.LifePayStatusEnum.已支付) ||
  //   payStatus === LifeRechargeConstants.LifePayStatusEnum.待退款
  // ) {
  //   return LifeRechargeConstants.LifePayOrderFrontStatusEnum.支付成功;
  // }
  if (
    lifePayOrderStatus === LifeRechargeConstants.LifePayOrderStatusEnum.已退款 ||
    payStatus === LifeRechargeConstants.LifePayStatusEnum.已退款
@@ -183,5 +183,5 @@
  ) {
    return LifeRechargeConstants.LifePayOrderFrontStatusEnum.充值成功;
  }
  return;
  return LifeRechargeConstants.LifePayOrderFrontStatusEnum.支付成功;
}

 packages/components/src/views/Order/components/ElectricOrder.vue

@@ -54,6 +54,17 @@
          label="完成时间:"
          :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
        />
        <OrderCardItem
          v-else-if="
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款待审核 ||
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款失败
          "
          label="退款发起时间:"
          labelWidth="110px"
          :value="
            item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
          "
        />
        <template v-else>
          <OrderCardItem label="退款金额:" :value="`￥${toThousand(item?.payAmount)}`" danger />
          <OrderCardItem

 packages/components/src/views/Order/components/GasOrder.vue

@@ -46,6 +46,17 @@
          label="完成时间:"
          :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
        />
        <OrderCardItem
          v-else-if="
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款待审核 ||
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款失败
          "
          label="退款发起时间:"
          labelWidth="110px"
          :value="
            item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
          "
        />
        <template v-else>
          <OrderCardItem label="退款金额:" :value="`￥${toThousand(item?.payAmount)}`" danger />
          <OrderCardItem

 packages/components/src/views/Order/components/PhoneOrder.vue

@@ -46,6 +46,17 @@
          label="完成时间:"
          :value="item?.finishTime && dayjs(item?.finishTime).format('YYYY-MM-DD HH:mm:ss')"
        />
        <OrderCardItem
          v-else-if="
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款待审核 ||
            item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.退款失败
          "
          label="退款发起时间:"
          labelWidth="110px"
          :value="
            item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
          "
        />
        <template v-else>
          <OrderCardItem label="退款金额:" :value="`￥${toThousand(item?.payAmount)}`" danger />
          <OrderCardItem

 packages/core/src/lifeRechargeServices.ts

@@ -514,6 +514,8 @@
  creationTime?: string;
  /** 退款时间 */
  refundTime?: string;
  /** 退款申请时间 */
  refundApplyTime?: string;
  /** 退款凭证 */
  refundCredentialsImgUrl?: string;
  refundApplyRemark?: string;

 packages/services/api/WxPayNotify.ts

@@ -2,6 +2,21 @@
// @ts-ignore
import { request } from '@/utils/request';

/** 此处后端没有提供注释 POST /api/WxPayNotify/WxPayDomesticRefundsNotify */
export async function wxPayDomesticRefundsNotify(
  body: API.WxRechargeNotifyInput,
  options?: API.RequestConfig
) {
  return request<API.WxRechargeNotifyResult>('/api/WxPayNotify/WxPayDomesticRefundsNotify', {
    method: 'POST',
    headers: {
      'Content-Type': 'application/json',
    },
    data: body,
    ...(options || {}),
  });
}

/** 微信支付回调通知 POST /api/WxPayNotify/WxRechargeNotify */
export async function wxRechargeNotify(
  body: API.WxRechargeNotifyInput,

 packages/services/api/typings.d.ts

@@ -1074,6 +1074,8 @@
    lifePayOrderType?: LifePayOrderTypeEnum;
    /** 订单号 */
    orderNo?: string;
    /** 退款订单号 */
    refundOrderNo?: string;
    /** 充值金额 */
    rechargeAmount?: number;
    /** 实际充值金额 */
@@ -1110,6 +1112,9 @@
    acoolyOrderNo?: string;
    acoolyStatus?: ACOOLYStatusEnum;
    lifePayRefundStatus?: LifePayRefundStatusEnum;
    /** 实际到账金额 */
    actualReceivedAmount?: number;
    actualReceivedStatus?: LifePayStatusEnum;
  }

  interface LifePayOrderListOutputPageOutput {
@@ -1631,6 +1636,10 @@
    beginFinishTime?: string;
    /** 结束完成时间 */
    endFinishTime?: string;
    /** 开始退款时间 */
    beginRefundTime?: string;
    /** 结束退款时间 */
    endRefundTime?: string;
    payStatus?: LifePayStatusEnum;
    acoolyStatus?: ACOOLYStatusEnum;
    lifePayOrderStatus?: LifePayOrderStatusEnum;
@@ -2060,6 +2069,8 @@
    creationTime?: string;
    /** 退款时间 */
    refundTime?: string;
    /** 退款申请时间 */
    refundApplyTime?: string;
    /** 退款凭证 */
    refundCredentialsImgUrl?: string;
    refundApplyRemark?: string;