|
@@ -207,8 +207,8 @@ class OrderModel |
|
@@ -207,8 +207,8 @@ class OrderModel |
207
|
$result['orderNum'] = $orderDetail['data']['order_code'];
|
207
|
$result['orderNum'] = $orderDetail['data']['order_code'];
|
208
|
$result['orderTime'] = date('Y-m-d H:i:s', $orderDetail['data']['create_time']);
|
208
|
$result['orderTime'] = date('Y-m-d H:i:s', $orderDetail['data']['create_time']);
|
209
|
//倒计时时间
|
209
|
//倒计时时间
|
210
|
- if (isset($orderDetail['counter_flag']) && $orderDetail['counter_flag'] == 'Y') {
|
|
|
211
|
- $result['leftTime'] = $orderDetail['data']['pay_lefttime'];
|
210
|
+ if (isset($orderDetail['data']['counter_flag']) && $orderDetail['data']['counter_flag'] == 'Y') {
|
|
|
211
|
+ $result['leftTime'] = $orderDetail['data']['pay_lefttime']*1000;
|
212
|
}
|
212
|
}
|
213
|
$result['goods'] = Helpers::formatOrderGoods($orderDetail['data']['order_goods'], $count, true);
|
213
|
$result['goods'] = Helpers::formatOrderGoods($orderDetail['data']['order_goods'], $count, true);
|
214
|
$result['sumPrice'] = $orderDetail['data']['goods_total_amount']; // 商品总金额
|
214
|
$result['sumPrice'] = $orderDetail['data']['goods_total_amount']; // 商品总金额
|
|
@@ -226,7 +226,6 @@ class OrderModel |
|
@@ -226,7 +226,6 @@ class OrderModel |
226
|
$result['isPay'] = $orderDetail['data']['payment_status'] === 'Y';
|
226
|
$result['isPay'] = $orderDetail['data']['payment_status'] === 'Y';
|
227
|
}
|
227
|
}
|
228
|
}
|
228
|
}
|
229
|
-
|
|
|
230
|
return $result;
|
229
|
return $result;
|
231
|
}
|
230
|
}
|
232
|
|
231
|
|