|
@@ -284,13 +284,15 @@ class OrderService extends BaseService
|
|
|
|
|
|
|
|
// 商品数据
|
|
// 商品数据
|
|
|
$orderNo = get_order_num('JK');
|
|
$orderNo = get_order_num('JK');
|
|
|
- $result = GoodsService::make()->getOrderGoods($ids, $goods, $userId, $orderNo,$discountPoint,$couponId);
|
|
|
|
|
|
|
+ $result = GoodsService::make()->getOrderGoods($ids, $goods, $userId, $orderNo, $discountPoint, $couponId);
|
|
|
if (empty($result)) {
|
|
if (empty($result)) {
|
|
|
RedisService::clear($cacheLockKey);
|
|
RedisService::clear($cacheLockKey);
|
|
|
$this->error = GoodsService::make()->getError();
|
|
$this->error = GoodsService::make()->getError();
|
|
|
return false;
|
|
return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ var_dump($result);
|
|
|
|
|
+
|
|
|
$orderGoods = isset($result['goods']) ? $result['goods'] : [];
|
|
$orderGoods = isset($result['goods']) ? $result['goods'] : [];
|
|
|
$goodsTotal = isset($result['goods_total']) ? $result['goods_total'] : 0; // 商品总价
|
|
$goodsTotal = isset($result['goods_total']) ? $result['goods_total'] : 0; // 商品总价
|
|
|
$orderTotal = isset($result['order_total']) ? $result['order_total'] : 0; // 订单结算金额(折后)
|
|
$orderTotal = isset($result['order_total']) ? $result['order_total'] : 0; // 订单结算金额(折后)
|