!542 同步支付中心、商城最新实现

Merge pull request !542 from 芋道源码/feature/mall_product

Author: YunaiV

src/api/pay/app.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 创建支付应用信息
+// 创建支付应用
 export function createApp(data) {
   return request({
     url: '/pay/app/create',
@@ -9,7 +9,7 @@ export function createApp(data) {
   })
 }
 
-// 更新支付应用信息
+// 更新支付应用
 export function updateApp(data) {
   return request({
     url: '/pay/app/update',
@@ -18,7 +18,7 @@ export function updateApp(data) {
   })
 }
 
-// 支付应用信息状态修改
+// 支付应用状态修改
 export function changeAppStatus(id, status) {
   const data = {
     id,
@@ -31,23 +31,23 @@ export function changeAppStatus(id, status) {
   })
 }
 
-// 删除支付应用信息
+// 删除支付应用
 export function deleteApp(id) {
   return request({
     url: '/pay/app/delete?id=' + id,
     method: 'delete'
   })
 }
 
-// 获得支付应用信息
+// 获得支付应用
 export function getApp(id) {
   return request({
     url: '/pay/app/get?id=' + id,
     method: 'get'
   })
 }
 
-// 获得支付应用信息分页
+// 获得支付应用分页
 export function getAppPage(query) {
   return request({
     url: '/pay/app/page',
@@ -56,23 +56,10 @@ export function getAppPage(query) {
   })
 }
 
-// 导出支付应用信息 Excel
-export function exportAppExcel(query) {
+// 获得支付应用列表
+export function getAppList() {
   return request({
-    url: '/pay/app/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 根据商ID称搜索应用列表
-export function getAppListByMerchantId(merchantId) {
-  return request({
-    url: '/pay/app/list-merchant-id',
-    params:{
-      merchantId:merchantId
-    },
+    url: '/pay/app/list',
     method: 'get'
   })
 }

src/api/pay/channel.js

@@ -28,44 +28,14 @@ export function deleteChannel(id) {
 }
 
 // 获得支付渠道
-// export function getChannel(id) {
-//   return request({
-//     url: '/pay/channel/get?id=' + id,
-//     method: 'get'
-//   })
-// }
-
-
-
-// 获得支付渠道分页
-export function getChannelPage(query) {
+export function getChannel(appId, code) {
   return request({
-    url: '/pay/channel/page',
+    url: '/pay/channel/get',
     method: 'get',
-    params: query
-  })
-}
-
-// 导出支付渠道Excel
-export function exportChannelExcel(query) {
-  return request({
-    url: '/pay/channel/export-excel',
-    method: 'get',
-    params: query,
-    responseType: 'blob'
-  })
-}
-
-// 获得支付渠道
-export function getChannel(merchantId,appId,code) {
-  return request({
-    url: '/pay/channel/get-channel',
     params:{
-      merchantId:merchantId,
-      appId:appId,
-      code:code
+      appId,
+      code
     },
-    method: 'get'
   })
 }
 

src/api/pay/merchant.js

@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+// 获得支付通知明细
+export function getNotifyTaskDetail(id) {
+  return request({
+    url: '/pay/notify/get-detail?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得支付通知分页
+export function getNotifyTaskPage(query) {
+  return request({
+    url: '/pay/notify/page',
+    method: 'get',
+    params: query
+  })
+}

src/api/pay/notify.js

@@ -36,6 +36,9 @@ export default {
         return router.push(lastPath || '/');
       });
     }
+    if (typeof obj === "function") {
+      return store.dispatch('tagsView/delView', router.currentRoute).then(obj);
+    }
     return store.dispatch('tagsView/delView', obj);
   },
   // 关闭所有tab页签

src/assets/images/pay/icon/wx_bar.svg

@@ -227,14 +227,14 @@ export const constantRoutes = [
     component: Layout,
     hidden: true,
     children: [{
-      path: 'order/submit',
-      name: 'PayOrderSubmit',
+      path: 'cashier',
+      name: 'PayCashier',
       hidden: true,
       meta: {
         title: '收银台',
         noCache: true
       },
-      component: (resolve) => require(['@/views/pay/order/submit'], resolve)
+      component: (resolve) => require(['@/views/pay/cashier'], resolve)
     }]
   }
 ]

src/assets/images/pay/icon/wx_native.svg

@@ -132,6 +132,14 @@ export const PayChannelEnum = {
     "code": "wx_app",
     "name": "微信 APP 支付"
   },
+  WX_NATIVE: {
+    "code": "wx_native",
+    "name": "微信扫码支付"
+  },
+  WX_BAR: {
+    "code": "wx_bar",
+    "name": "微信条码支付"
+  },
   ALIPAY_PC: {
     "code": "alipay_pc",
     "name": "支付宝 PC 网站支付"
@@ -169,17 +177,12 @@ export const PayDisplayModeEnum = {
   },
   QR_CODE: {
     "mode": "qr_code"
+  },
+  APP: {
+    "mode": "app"
   }
 }
 
-/**
- * 支付类型枚举
- */
-export const PayType = {
-  WECHAT: "WECHAT",
-  ALIPAY: "ALIPAY"
-}
-
 /**
  * 支付订单状态枚举
  */
@@ -198,42 +201,6 @@ export const PayOrderStatusEnum = {
   }
 }
 
-/**
- * 支付订单回调状态枚举
- */
-export const PayOrderNotifyStatusEnum = {
-  NO: {
-    status: 0,
-    name: '未通知'
-  },
-  SUCCESS: {
-    status: 10,
-    name: '通知成功'
-  },
-  FAILURE: {
-    status: 20,
-    name: '通知失败'
-  }
-}
-
-/**
- * 支付订单退款状态枚举
- */
-export const PayOrderRefundStatusEnum = {
-  NO: {
-    status: 0,
-    name: '未退款'
-  },
-  SOME: {
-    status: 10,
-    name: '部分退款'
-  },
-  ALL: {
-    status: 20,
-    name: '全部退款'
-  }
-}
-
 /**
  * 支付退款订单状态枚举
  */

src/plugins/tab.js

@@ -51,15 +51,12 @@ export const DICT_TYPE = {
 
   // ========== PAY 模块 ==========
   PAY_CHANNEL_WECHAT_VERSION: 'pay_channel_wechat_version', // 微信渠道版本
-  PAY_CHANNEL_ALIPAY_SIGN_TYPE: 'pay_channel_alipay_sign_type', // 支付渠道支付宝算法类型
-  PAY_CHANNEL_ALIPAY_MODE: 'pay_channel_alipay_mode', // 支付宝公钥类型
-  PAY_CHANNEL_ALIPAY_SERVER_TYPE: 'pay_channel_alipay_server_type', // 支付宝网关地址
-  PAY_CHANNEL_CODE_TYPE: 'pay_channel_code_type', // 支付渠道编码类型
-  PAY_ORDER_NOTIFY_STATUS: 'pay_order_notify_status', // 商户支付订单回调状态
+
+  PAY_CHANNEL_CODE: 'pay_channel_code', // 支付渠道编码类型
   PAY_ORDER_STATUS: 'pay_order_status', // 商户支付订单状态
-  PAY_ORDER_REFUND_STATUS: 'pay_order_refund_status', // 商户支付订单退款状态
-  PAY_REFUND_ORDER_STATUS: 'pay_refund_order_status', // 退款订单状态
-  PAY_REFUND_ORDER_TYPE: 'pay_refund_order_type', // 退款订单类别
+  PAY_REFUND_STATUS: 'pay_refund_status', // 退款订单状态
+  PAY_NOTIFY_STATUS: 'pay_notify_status', // 商户支付回调状态
+  PAY_NOTIFY_TYPE: 'pay_notify_type', // 商户支付回调状态
 
   // ========== MP 模块 ==========
   MP_AUTO_REPLY_REQUEST_MATCH: 'mp_auto_reply_request_match', // 自动回复请求匹配类型