diff --git a/README.md b/README.md index 88a448dd..6fa81c5d 100644 --- a/README.md +++ b/README.md @@ -7,9 +7,20 @@ ## 🍈项目介绍 -> DaxPay是一套基于Bootx-Platform脚手架构建的一套开源支付网关系统,已经对接支付宝、微信支付相关的接口,以及扩展了钱包支付、储值卡支付、现金支付等新的支付方式。 +> DaxPay是一套基于Bootx-Platform脚手架构建的一套开源支付网关系统,已经对接支付宝、微信支付、云闪付相关的接口。 > 可以独立部署,提供接口供业务系统进行调用,不对原有系统产生影响 + +## 项目启动 +```shell +# 安装项目依赖, 请使用Node20.x版本, pnpm使用8.0.0到8.5.1版本,推荐直接使用8.5.1版本,更高版本会导致 pnpm-lock.yaml 失效 +pnpm install +# 启动项目 +pnpm run dev +# 构建打包 +pnpm build +``` + ## 🍒 文档和源码地址 ### 文档地址 在 [Bootx开源文档站](https://bootx.gitee.io/) 下的支付网关(DaxPay)模块下可以进行查阅相关文档,具体链接地址如下: @@ -52,16 +63,6 @@ 手机收银台地址: https://daxpay.demo.bootx.cn/h5/#/cashier/uniCashier -## 项目启动 -```shell -# 安装项目依赖, 请使用Node20.x版本, pnpm使用8.x版本, -pnpm install -# 启动项目 -pnpm run dev -# 构建打包 -pnpm build -``` - ## 常见问题 出现以下错误不用管,不影响使用,只在第一次启动时出现,之后就不会再出现 ```shell diff --git a/src/views/payment/order/pay/PayOrder.api.ts b/src/views/payment/order/pay/PayOrder.api.ts index f5ff81c2..aed8038a 100644 --- a/src/views/payment/order/pay/PayOrder.api.ts +++ b/src/views/payment/order/pay/PayOrder.api.ts @@ -33,16 +33,6 @@ export function getOrderByOrderNo(orderNo: string) { }) } -/** - * 获取订单扩展信息 - */ -export function getOrderExtra(id) { - return defHttp.get>({ - url: '/order/pay/getExtraById', - params: { id }, - }) -} - /** * 根据订单号同步支付状态 */ diff --git a/src/views/payment/order/refund/RefundOrder.api.ts b/src/views/payment/order/refund/RefundOrder.api.ts index 84ba63d1..5012b6b3 100644 --- a/src/views/payment/order/refund/RefundOrder.api.ts +++ b/src/views/payment/order/refund/RefundOrder.api.ts @@ -21,13 +21,22 @@ export function get(id) { params: { id }, }) } +/** + * 获取单条 + */ +export function getByRefundNo(refundNo) { + return defHttp.get>({ + url: '/order/refund/findByOrderNo', + params: { refundNo }, + }) +} /** * 获取订单扩展信息 */ export function getOrderExtra(id) { return defHttp.get>({ - url: '/order/refund/getExtraById', + url: '/order/refund/findExtraById', params: { id }, }) } diff --git a/src/views/payment/order/refund/RefundOrderInfo.vue b/src/views/payment/order/refund/RefundOrderInfo.vue index b92aca7d..9e3b948b 100644 --- a/src/views/payment/order/refund/RefundOrderInfo.vue +++ b/src/views/payment/order/refund/RefundOrderInfo.vue @@ -55,7 +55,7 @@