...
|
...
|
@@ -482,9 +482,16 @@ class CartModel |
|
|
// 订单数据
|
|
|
if (isset($payReturn['shopping_cart_data']) && !empty($payReturn['shopping_cart_data'])) {
|
|
|
$sumPrice = isset($orderCompute['order_amount']) ? $orderCompute['order_amount'] : $payReturn['shopping_cart_data']['order_amount'];
|
|
|
$freight = isset($orderCompute['promotion_formula_list']['promotion_amount']) ? $orderCompute['promotion_formula_list'][1]['promotion_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
|
|
|
|
|
|
$freight = '¥0';
|
|
|
if (isset($orderCompute['promotion_formula_list'][1]['promotion_amount'])) {
|
|
|
$freight = $orderCompute['promotion_formula_list'][1]['promotion_amount'];
|
|
|
} elseif(isset($payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'])) {
|
|
|
$freight = $payReturn['shopping_cart_data']['promotion_formula_list'][1]['promotion_amount'];
|
|
|
}
|
|
|
|
|
|
$couponPrice = isset($orderCompute['coupon_amount']) ? $orderCompute['coupon_amount'] : false;
|
|
|
$salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['promotion_formula_list'][3]['promotion_amount'];
|
|
|
$salePrice = isset($orderCompute['discount_amount']) ? $orderCompute['discount_amount'] : $payReturn['shopping_cart_data']['discount_amount'];
|
|
|
$price = isset($orderCompute['last_order_amount']) ? $orderCompute['last_order_amount'] : $payReturn['shopping_cart_data']['last_order_amount'];
|
|
|
$result['sumPrice'] = Helpers::transPrice($sumPrice);
|
|
|
$result['salePrice'] = Helpers::transPrice($salePrice);
|
...
|
...
|
|