Преглед на файлове

rk检查放过支付回调

lrf преди 2 години
родител
ревизия
ac561cadbd
променени са 4 файла, в които са добавени 11 реда и са изтрити 4 реда
  1. 8 1
      app/middleware/checkUserRK.js
  2. 1 1
      app/service/trade/pay.js
  3. 1 1
      app/z_router/trade/pay.js
  4. 1 1
      config/config.default.js

+ 8 - 1
app/middleware/checkUserRK.js

@@ -1,6 +1,13 @@
 'use strict';
 const _ = require('lodash');
-const whiteList = [ '/util/crk', '/admin/login', '/user/wxLogin', '/user/login', '/user' ];
+const whiteList = [
+  '/util/crk', // 生成rk
+  '/admin/login', // 管理登陆
+  '/user/wxLogin', // 用户微信登陆
+  '/user/login', // 用户密码登录
+  '/user', // 创建用户
+  '/pay/order', // 支付回调
+];
 module.exports = options => {
   return async function checkuserrk(ctx, next) {
     const request = _.get(ctx, 'request');

+ 1 - 1
app/service/trade/pay.js

@@ -226,7 +226,7 @@ class PayService extends CrudService {
    */
   getWxPayData(order_id, money, no) {
     const openid = _.get(this.ctx, 'user.openid');
-    const data = { config: this.appConfig, money, openid, order_no: no, desc: '购物', notice_url: this.payOrderReturnUrl(order_id) };
+    const data = { config: this.appConfig, money, openid, order_no: no, desc: '购物', notice_url: this.payOrderReturnUrl };
     return data;
   }
 

+ 1 - 1
app/z_router/trade/pay.js

@@ -7,7 +7,7 @@ const rkey = 'pay';
 const ckey = 'trade.pay';
 const keyZh = '支付接口';
 const routes = [
-  { method: 'post', path: `${rkey}/order/:id`, controller: `${ckey}.callBackPayOrder`, zh: `${keyZh}-支付回调函数` },
+  { method: 'post', path: `${rkey}/order`, controller: `${ckey}.callBackPayOrder`, zh: `${keyZh}-支付回调函数` },
   { method: 'post', path: `${rkey}/toPayOrder`, controller: `${ckey}.toPayOrder`, zh: `${keyZh}-去支付订单` },
 ];
 

+ 1 - 1
config/config.default.js

@@ -88,7 +88,7 @@ module.exports = appInfo => {
   config.routePrefix = '/dev/point/v1/api';
   // 支付路由回调设置
   config.payReturn = {
-    order: id => `/dev/point/v1/api/pay/order/${id}`,
+    order: '/dev/point/v1/api/pay/order',
   };
 
   // http请求前缀