|
|
@@ -90,7 +90,7 @@ class GongdengOrderService extends BaseService
|
|
|
->leftJoin('gongdeng_foxiang as gf', 'gf.id', '=', 'a.source_id')
|
|
|
->leftJoin('member as m', 'a.user_id', '=', 'm.id')
|
|
|
->where(['a.mark' => 1, 'a.status' => 2,'a.user_id'=> $userId])
|
|
|
- ->select(['a.id', 'a.source_id', 'a.user_id', 'a.sf_name', 'a.qf_content','a.lamp_status','a.device_num', 'a.is_hide','a.expire_time', 'gf.name as fx_name', 'm.nickname', 'm.avatar', 'a.status', 'a.create_time', 'a.pay_at', 'a.update_time'])
|
|
|
+ ->select(['a.id', 'a.source_id', 'a.user_id', 'a.sf_name','gf.thumb as fx_thumb','a.pay_money', 'a.qf_content','a.lamp_status','a.device_num', 'a.is_hide','a.expire_time', 'gf.name as fx_name', 'm.nickname', 'm.avatar', 'a.status', 'a.create_time', 'a.pay_at', 'a.update_time'])
|
|
|
->orderBy('a.pay_at', 'desc')
|
|
|
->orderBy('a.create_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
@@ -99,6 +99,7 @@ class GongdengOrderService extends BaseService
|
|
|
if ($dataList) {
|
|
|
foreach ($dataList['data'] as &$item) {
|
|
|
$item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
|
|
|
+ $item['fx_thumb'] = $item['fx_thumb'] ? get_image_url($item['fx_thumb']) : '';
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
|
|
|
$item['expire_at'] = $item['expire_time'] ? datetime($item['expire_time'], 'Y-m-d H:i:s') : '';
|
|
|
$time = $item['pay_at'] ? $item['pay_at'] : $item['create_time'];
|
