...
|
...
|
@@ -145,10 +145,10 @@ class OrderModel |
|
|
$result['orderTime'] = date('Y-m-d H:i:s', $orderDetail['data']['create_time']);
|
|
|
$result['goods'] = Helpers::formatOrderGoods($orderDetail['data']['order_goods'], $count, true);
|
|
|
$result['sumPrice'] = $orderDetail['data']['goods_total_amount']; // 商品总金额
|
|
|
$result['salePrice'] = $orderDetail['data']['promotion_amount']; // 活动金额
|
|
|
$result['salePrice'] = self::filterOrderPrice($orderDetail['data']['promotion_amount']); // 活动金额
|
|
|
$result['freight'] = $orderDetail['data']['shipping_cost']; // 运费
|
|
|
$result['coupon'] = $orderDetail['data']['coupons_amount']; // 优惠券
|
|
|
$result['yohoCoin'] = $orderDetail['data']['yoho_coin_num']; // YOHO币
|
|
|
$result['coupon'] = self::filterOrderPrice($orderDetail['data']['coupons_amount']); // 优惠券
|
|
|
$result['yohoCoin'] = self::filterOrderPrice($orderDetail['data']['yoho_coin_num']); // YOHO币
|
|
|
$result['price'] = $orderDetail['data']['amount']; // 实付金额
|
|
|
$result['goodsAmount'] = $orderDetail['data']['payment_amount']; // 商品总金额没有人民币符号
|
|
|
$result['orderCount'] = $count; // 订单总件数
|
...
|
...
|
@@ -267,4 +267,15 @@ class OrderModel |
|
|
return $result;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 过滤掉为0的价格数据
|
|
|
*
|
|
|
* @param $price
|
|
|
* @return string 过滤之后的价格
|
|
|
*/
|
|
|
private static function filterOrderPrice($price)
|
|
|
{
|
|
|
return empty(intval(preg_replace('/[+|\-|¥]/s', '', $price))) ? '' : $price;
|
|
|
}
|
|
|
|
|
|
} |
...
|
...
|
|