Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3

 Conflicts:

	src/utils/constants.ts

src/api/pay/app/index.ts

@@ -76,3 +76,9 @@ export const exportApp = (params: AppExportReqVO) => {
 export const getAppListByMerchantId = (merchantId: number) => {
   return request.get({ url: '/pay/app/list-merchant-id', params: { merchantId: merchantId } })
 }
+
+export const getAppList = () => {
+  return request.get({
+    url: '/pay/app/list'
+  })
+}

src/api/pay/demo/index.ts

@@ -0,0 +1,36 @@
+import request from '@/config/axios'
+
+export interface DemoOrderVO {
+  spuId: number
+  createTime: Date
+}
+
+// 创建示例订单
+export function createDemoOrder(data: DemoOrderVO) {
+  return request.post({
+    url: '/pay/demo-order/create',
+    data: data
+  })
+}
+
+// 获得示例订单
+export function getDemoOrder(id: number) {
+  return request.get({
+    url: '/pay/demo-order/get?id=' + id
+  })
+}
+
+// 获得示例订单分页
+export function getDemoOrderPage(query: PageParam) {
+  return request.get({
+    url: '/pay/demo-order/page',
+    params: query
+  })
+}
+
+// 退款示例订单
+export function refundDemoOrder(id) {
+  return request.put({
+    url: '/pay/demo-order/refund?id=' + id
+  })
+}

src/api/pay/notify/index.ts

@@ -0,0 +1,15 @@
+import request from '@/config/axios'
+
+export const getNotifyTaskDetail = (id) => {
+  return request.get({
+    url: '/pay/notify/get-detail?id=' + id
+  })
+}
+
+// 获得支付通知分页
+export const getNotifyTaskPage = (query) => {
+  return request.get({
+    url: '/pay/notify/page',
+    params: query
+  })
+}

src/api/pay/order/index.ts

@@ -95,7 +95,7 @@ export const getOrderDetail = async (id: number) => {
 
 // 新增支付订单
 export const createOrder = async (data: OrderVO) => {
-  return await request.post({ url: '/pay/order/create', data })
+  return await request.post({ url: '/pay/order/submit', data })
 }
 
 // 修改支付订单