|
@@ -97,6 +97,7 @@ class StoreOrder extends BaseModel
|
|
|
$item['_info'] = $_info;
|
|
$item['_info'] = $_info;
|
|
|
$item['spread_nickname'] = User::where('uid', $item['spread_uid'])->value('nickname');
|
|
$item['spread_nickname'] = User::where('uid', $item['spread_uid'])->value('nickname');
|
|
|
$item['add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
|
|
$item['add_time'] = $item['add_time'] ? date('Y-m-d H:i:s', $item['add_time']) : '';
|
|
|
|
|
+ $item['arrive_time'] = $item['arrive_time'] ? date('Y-m-d H:i:s', $item['arrive_time']) : '';
|
|
|
$item['back_integral'] = $item['back_integral'] ?: 0;
|
|
$item['back_integral'] = $item['back_integral'] ?: 0;
|
|
|
if ($item['pink_id'] || $item['combination_id']) {
|
|
if ($item['pink_id'] || $item['combination_id']) {
|
|
|
$pinkStatus = StorePink::where('order_id_key', $item['id'])->value('status');
|
|
$pinkStatus = StorePink::where('order_id_key', $item['id'])->value('status');
|