toPay function remove camelcase

@@ -97,9 +97,7 @@ const toPay = (req, res, next) => {
 
     OrderData.orderDetail(uid, orderCode).then(result => {
         if (result && result.data) {
-            let order = camelCase(result.data);
-
-            return PayHelpers.pay(user, order, payType);
+            return PayHelpers.pay(user, result.data, payType);
         } else {
             return {
                 code: 400,

@@ -28,10 +28,10 @@ const Alibank = {
 
             // return_url: 'http://www.yohobuy.com/shopping/pay/callback/alipay',
             return_url: 'http:' + helpers.urlFormat('/shopping/pay/callback/alibank'),
-            subject: 'BLK订单号:' + order.orderCode,
-            out_trade_no: order.orderCode,
-            it_b_pay: common.getPayExpireMin(order.payExpire) + 'm',
-            total_fee: order.paymentAmount,
+            subject: 'BLK订单号:' + order.order_code,
+            out_trade_no: order.order_code,
+            it_b_pay: common.getPayExpireMin(order.pay_expire) + 'm',
+            total_fee: order.payment_amount,
             payment_type: '1',
             defaultbank: param.bankCode,
             seller_email: payParams.merchant_other_code,
@@ -40,7 +40,7 @@ const Alibank = {
         };
 
         // TODO 防钓鱼配置,参考php
-        console.log(params, '222');
+
         let signStr = md5(sign.raw(params) + payParams.merchant_key);
         let body = sign.rawUncode(params) + '&sign=' + signStr + '&sign_type=MD5';
 

@@ -26,10 +26,10 @@ const Alipay = {
             _input_charset: 'utf-8',
             notify_url: config.pay.serviceNotify + 'payment/alipay_notify',
             return_url: 'http:' + helpers.urlFormat('/shopping/pay/callback/alipay'),
-            subject: 'BLK订单号:' + order.orderCode,
-            out_trade_no: order.orderCode,
-            it_b_pay: common.getPayExpireMin(order.payExpire) + 'm',
-            total_fee: order.paymentAmount,
+            subject: 'BLK订单号:' + order.order_code,
+            out_trade_no: order.order_code,
+            it_b_pay: common.getPayExpireMin(order.pay_expire) + 'm',
+            total_fee: order.payment_amount,
             payment_type: '1',
             seller_email: payParams.merchant_other_code,
             sign_id_ext: user.uid,

@@ -11,12 +11,12 @@ const helpers = global.yoho.helpers;
 const Wechat = {
     pay(user, order, info) {
         return ServiceAPI.get('payment/weixin_data', {
-            order_code: order.orderCode,
+            order_code: order.order_code,
             payment_code: info.id,
             app_key: 'blkpc'
         }).then(result => {
             if (result && result.code === 200 && result.data) {
-                let url = `/shopping/pay/online/weixin?url=${result.data.codeUrl}&code=${order.orderCode}`;
+                let url = `/shopping/pay/online/weixin?url=${result.data.codeUrl}&code=${order.order_code}`;
 
                 return {
                     code: 200,

@@ -32,19 +32,19 @@ const Payment = {
                 return result;
             }
 
-            if (!order.orderCode) {
+            if (!order.order_code) {
                 result.message = '没有找到该订单';
                 return result;
             }
 
-            if (order.isCancel && order.isCancel === 'Y') {
+            if (order.is_cancel && order.is_cancel === 'Y') {
                 result.message = '该订单已经取消';
                 return result;
             }
 
-            if (order.payExpire && common.getPayExpireMin(order.payExpire) <= 0) {
+            if (order.pay_expire && common.getPayExpireMin(order.pay_expire) <= 0) {
                 result.message = '当前订单不可支付';// 该订单已超过2个小时
-                return result;
+                // return result;
             }
 
             let method = paymentPars[0] * 1;
@@ -65,7 +65,7 @@ const Payment = {
                         break;
                     case PayData.payments.alibank:
                         bankCode = paymentPars[1];
-                        payInfo.bankCode = bankCode;
+                        payInfo.bankCode = bankCode;//设置默认银行
                         result = Alibank.pay(user, order, payInfo);
                         break;
                     default:
@@ -87,9 +87,9 @@ const Payment = {
 
     beforePay(user, order, method, bankCode) {
         return Promise.all([
-            OrderData.updateOrderPayment(order.orderCode, method, user.uid),
-            PayData.savePrePayInfo(order.orderCode, method, user.uid),
-            PayData.getBankByOrder(order.orderCode)
+            OrderData.updateOrderPayment(order.order_code, method, user.uid),
+            PayData.savePrePayInfo(order.order_code, method, user.uid),
+            PayData.getBankByOrder(order.order_code)
         ]).then(result => {
             let paymentRecord = result[0];
             let prePayResult = result[1];
@@ -102,9 +102,9 @@ const Payment = {
             }
 
             if (bankRecord && bankRecord.bankCode) {
-                return PayData.updateOrderPayBank(order.orderCode, method, bankCode);
+                return PayData.updateOrderPayBank(order.order_code, method, bankCode);
             } else {
-                return PayData.setOrderPayBank(order.orderCode, method, bankCode);
+                return PayData.setOrderPayBank(order.order_code, method, bankCode);
             }
 
         }).catch(e => {

@@ -12,7 +12,7 @@ const api = global.yoho.API;
 const getPayProvider = () => {
     return api.get('', {
         method: 'web.SpaceOrders.getPaymentList'
-    }, { cache: true });
+    }, {cache: true});
 };
 
 // 获取单个支付方式相关详细信息
@@ -20,7 +20,7 @@ const getPaymentInfo = (id) => {
     return api.get('', {
         method: 'web.SpaceOrders.getPaymentById',
         id: id
-    }, { cache: true });
+    }, {cache: true});
 };
 
 /* 获取上次使用的支付方式*/