Merge branch 'master' of t-git.51gjj.com:fangbin/51business

app/controller/credit/order.js

@@ -31,8 +31,9 @@ class OrderController extends Controller {
     async payOrder() {
 
         const { ctx } = this;
-        const order_id = ctx.params.order_id;
-        const result = await ctx.service.credit.order.unifiedOrder('wexin', order_id);
+        const input_params = ctx.request.body;
+        const { method, order_id } = input_params;
+        const result = await ctx.service.credit.order.unifiedOrder(method, order_id);
 
         ctx.success({ result });
     }
@@ -66,11 +67,12 @@ class OrderController extends Controller {
         const { ctx } = this;
         const order_id = ctx.params.order_id;
         const is_pay = await ctx.service.credit.order.checkOrderPay(order_id);
-        let result = false;
+        const order = await ctx.service.credit.order.getOrderInfo(order_id);
+        let status = 0;
         if (is_pay) {
-            result = true;
+            status = 1;
         }
-        ctx.success({ result });
+        ctx.success({ status, report_id: order.report_id });
     }
 
 

app/router/credit.js

@@ -5,7 +5,7 @@ module.exports = app => {
 
     router.get('/home', 'credit.order.getMyCredit');
     router.get('/history/:type', 'credit.order.getRecord');
-    router.post('/order/pay/:order_id', 'credit.order.payOrder');
+    router.post('/order/pay', 'credit.order.payOrder');
     router.get('/order/pay/:order_id', 'credit.order.payOrder');
     router.post('/order/pay_notice', 'credit.order.payNotice');
     router.get('/order/check_pay/:order_id', 'credit.order.checkPay');