Merge branch 'hotfix/orderensure' into 'master'

解决确认订单页面结算运费不对的问题



See merge request !587

@@ -64,7 +64,7 @@ exports.cartPay = (uid, cartType, orderInfo, limitProductCode, sku, skn, buyNumb
     }
 
     // cookie保存的数据
-    if (orderInfo) {
+    if (orderInfo && !_.isEmpty(orderInfo)) {
         orderInfo.paymentType = orderInfo.paymentType ? orderInfo.paymentType : '';
         orderComputeAPI = shoppingAPI.orderComputeAPI(
             uid,