Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vben into dev

apps/web-antd/src/api/pay/channel/index.ts

@@ -27,7 +27,7 @@ export function getChannelPage(params: PageParam) {
 }
 
 /** 查询支付渠道详情 */
-export function getChannel(appId: string, code: string) {
+export function getChannel(appId: number, code: string) {
   return requestClient.get<PayChannelApi.Channel>('/pay/channel/get', {
     params: { appId, code },
   });

apps/web-antd/src/api/pay/order/index.ts

@@ -6,8 +6,13 @@ export namespace PayOrderApi {
   /** 支付订单信息 */
   export interface Order {
     id: number;
+    no: string;
+    price: number;
+    channelFeePrice: number;
+    refundPrice: number;
     merchantId: number;
     appId: number;
+    appName: string;
     channelId: number;
     channelCode: string;
     merchantOrderId: string;
@@ -29,7 +34,9 @@ export namespace PayOrderApi {
     refundAmount: number;
     channelUserId: string;
     channelOrderNo: string;
+    channelNotifyData: string;
     createTime: Date;
+    updateTime: Date;
   }
 
   /** 支付订单分页请求 */