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