Merge branch 'feature/cart' into 'release/5.4.1'

支付宝支付CODE



See merge request !314

@@ -20,9 +20,8 @@ const logger = global.yoho.logger;
 
 
 // 支付方式
 // 支付方式
 const payments = {
 const payments = {
-    alipay: 33,
-    wechat: 22,
-    alibank: 42
+    alipay: 18,
+    wechat: 22
 };
 };
 
 
 // 资源位
 // 资源位
@@ -215,7 +214,9 @@ const procOrderData = (payResult, uid, sessionKey) => {
                 }
                 }
 
 
                 if (_.round(parseFloat(amount), 2) !== _.round(parseFloat(payResult.totalFee), 2)) {
                 if (_.round(parseFloat(amount), 2) !== _.round(parseFloat(payResult.totalFee), 2)) {
-                    logger.warn('front pay success but the amount is not same.', { payResult: payResult, order: order });
+                    logger.warn('front pay success but the amount is not same.', {
+                        payResult: payResult, order: order
+                    });
                     return {
                     return {
                         code: 415,
                         code: 415,
                         message: '支付金额与订单金额不一致，订单状态更新失败！'
                         message: '支付金额与订单金额不一致，订单状态更新失败！'