|
|
|
@ -194,25 +194,23 @@ class StoreKeeper extends Controller |
|
|
|
|
} else { |
|
|
|
|
$model = new OrderModel; |
|
|
|
|
$list = $model->getNewList($params); |
|
|
|
|
if (!empty($list)) { |
|
|
|
|
foreach ($list as $key => $value) { |
|
|
|
|
if (!empty($value->transfer)) { |
|
|
|
|
$value->transfer->chat_image_ids = []; |
|
|
|
|
$value->transfer->transfer_image_ids = []; |
|
|
|
|
} |
|
|
|
|
if (!empty($value['transfer']['chat_image_id'])) { |
|
|
|
|
$chat_image_ids = UploadFile::whereIn('file_id', explode(",", $value['transfer']['chat_image_id']))->field('file_id,file_path,file_type,storage,domain')->select(); |
|
|
|
|
foreach ($chat_image_ids as &$chat_image_id) { |
|
|
|
|
$chat_image_id['file_path'] = getUrl($chat_image_id['file_path'], $chat_image_id['domain']); |
|
|
|
|
if (!empty($list['data'])) { |
|
|
|
|
foreach ($list['data'] as $value) { |
|
|
|
|
if (!empty($value->transfer) && !empty($value->transfer->chat_image_id)) { |
|
|
|
|
if (!empty($value->transfer->chat_image_id)) { |
|
|
|
|
$chat_image_ids = UploadFile::whereIn('file_id', explode(",", $value->transfer->chat_image_id))->field('file_id,file_path,file_type,storage,domain')->select(); |
|
|
|
|
foreach ($chat_image_ids as &$chat_image_id) { |
|
|
|
|
$chat_image_id['file_path'] = getUrl($chat_image_id['file_path'], $chat_image_id['domain']); |
|
|
|
|
} |
|
|
|
|
$value->transfer->chat_image_ids = $chat_image_ids; |
|
|
|
|
} |
|
|
|
|
$list[$key]['transfer']['chat_image_ids'] = $chat_image_ids; |
|
|
|
|
} |
|
|
|
|
if (!empty(!empty($value['transfer']['transfer_image_id']))) { |
|
|
|
|
$transfer_image_ids = UploadFile::whereIn('file_id', explode(",", $value['transfer']['transfer_image_id']))->field('file_id,file_path,file_type,storage,domain')->select(); |
|
|
|
|
foreach ($transfer_image_ids as &$transfer_image_id) { |
|
|
|
|
$transfer_image_id['file_path'] = getUrl($transfer_image_id['file_path'], $transfer_image_id['domain']); |
|
|
|
|
if (!empty($value->transfer->transfer_image_id)) { |
|
|
|
|
$transfer_image_ids = UploadFile::whereIn('file_id', explode(",", $value->transfer->transfer_image_id))->field('file_id,file_path,file_type,storage,domain')->select(); |
|
|
|
|
foreach ($transfer_image_ids as &$transfer_image_id) { |
|
|
|
|
$transfer_image_id['file_path'] = getUrl($transfer_image_id['file_path'], $transfer_image_id['domain']); |
|
|
|
|
} |
|
|
|
|
$value->transfer->transfer_image_ids = $transfer_image_ids; |
|
|
|
|
} |
|
|
|
|
$list[$key]['transfer']['transfer_image_ids'] = $transfer_image_ids; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|