|
|
@@ -105,14 +105,15 @@ class ActivityBooksService extends BaseService
|
|
|
->leftJoin('activity as a', 'a.id', '=', 'b.aid')
|
|
|
->leftJoin('member as m', 'm.id', '=', 'b.user_id')
|
|
|
->where(['b.mark'=>1,'a.status'=> 1,'b.user_id'=> $userId,'a.mark'=> 1,'a.status'=> 1])
|
|
|
- ->select(['b.id', 'b.aid', 'a.title','a.thumb','b.coupon','a.publish_start','a.publish_end','a.price','b.gd_name','a.description', 'b.status', 'b.create_time', 'b.update_time'])
|
|
|
+ ->select(['b.id', 'b.aid', 'a.title','a.thumb','b.coupon','b.coupon_give','a.publish_start','a.publish_end','a.price','b.gd_name','a.description', 'b.status', 'b.create_time', 'b.update_time'])
|
|
|
->orderBy('b.update_time', 'desc')
|
|
|
->paginate($pageSize);
|
|
|
|
|
|
$dataList = $dataList ? $dataList->toArray() : [];
|
|
|
if ($dataList) {
|
|
|
foreach ($dataList['data'] as &$item) {
|
|
|
- $item['price'] = intval($item['price']);
|
|
|
+ $item['coupon'] = intval($item['coupon']);
|
|
|
+ $item['coupon_give'] = intval($item['coupon_give']);
|
|
|
$item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
|
|
|
$item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
|
|
|
|
