...
|
...
|
@@ -482,7 +482,6 @@ class CartModel |
|
|
if (isset($payReturn['goods_list'])) {
|
|
|
$oneGoods = array();
|
|
|
$goodsPrice = 0;
|
|
|
$yohoCoinNumAll = 0;
|
|
|
|
|
|
foreach ($payReturn['goods_list'] as $single) {
|
|
|
$oneGoods = array();
|
...
|
...
|
@@ -510,17 +509,13 @@ class CartModel |
|
|
|
|
|
// 累加商品金额
|
|
|
$goodsPrice += $oneGoods['count'] * $oneGoods['price'];
|
|
|
$yohoCoinNumAll += $oneGoods['yohoCoinNum'];
|
|
|
|
|
|
$result['goods'][] = $oneGoods;
|
|
|
}
|
|
|
|
|
|
// 商品金额
|
|
|
$result['goodsPrice'] = Helpers::transPrice($goodsPrice);
|
|
|
//$result['yohoCoinNum'] = $yohoCoinNumAll;
|
|
|
if($yohoCoinNumAll > 0) {
|
|
|
$result['yohoCoinNum'] = $yohoCoinNumAll;
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
// 支付方式
|
...
|
...
|
@@ -580,6 +575,11 @@ class CartModel |
|
|
$result['num'] = $payReturn['shopping_cart_data']['selected_goods_count'];
|
|
|
// 商品金额
|
|
|
// $result['goodsPrice'] = $payReturn['shopping_cart_data']['str_order_amount'];
|
|
|
|
|
|
//有货币
|
|
|
if($payReturn['shopping_cart_data']['gain_yoho_coin'] > 0) {
|
|
|
$result['yohoCoinNum'] = $payReturn['shopping_cart_data']['gain_yoho_coin'];
|
|
|
}
|
|
|
}
|
|
|
|
|
|
// 发票有关数据
|
...
|
...
|
|