wesmiler 报恩寺项目

app/Http/Controllers/Api/v1/GongdengController.php

@@ -33,6 +33,14 @@ class GongdengController extends BaseController
     }
 
     /**
+     * 套餐列表
+     * @return mixed
+     */
+    public function index(){
+        return $this->service->getList($this->userId);
+    }
+
+    /**
      * 佛像列表
      * @return mixed
      */

app/Services/GongdengOrderService.php

@@ -37,21 +37,50 @@ class GongdengOrderService extends BaseService
     }
 
     /**
-     * 获取列表
-     * @return array
-     * @since 2020/11/11
-     * @author wesmiler
+     * 功德列表
      */
-    public function getList()
+    public function getGdList()
     {
         $params = request()->all();
-        return parent::getList();
+        $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+
+        $dataList = $this->model::from('gongdeng_orders as a')
+            ->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])
+            ->select(['a.id', 'a.source_id', 'a.user_id', 'a.sf_name', 'a.qf_content', 'a.is_hide', '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);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'], 'Y-m-d H:i:s') : '';
+                $time = $item['pay_at'] ? $item['pay_at'] : $item['create_time'];
+                $item['time_text'] = $time ? format_time(strtotime($time)) : '刚刚';
+                if ($item['is_hide']) {
+                    $item['nickname'] = formatName($item['nickname']);
+                }
+            }
+            unset($item);
+        }
+
+        return [
+            'code' => 0,
+            'success' => true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
     }
 
     /**
-     * 功德列表
+     * 我的供灯列表
      */
-    public function getGdList()
+    public function getList($userId)
     {
         $params = request()->all();
         $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
@@ -60,8 +89,8 @@ class GongdengOrderService extends BaseService
         $dataList = $this->model::from('gongdeng_orders as a')
             ->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])
-            ->select(['a.id', 'a.source_id', 'a.user_id', 'a.sf_name', 'a.qf_content', 'a.is_hide', 'gf.name as fx_name', 'm.nickname', 'm.avatar', 'a.status', 'a.create_time', 'a.pay_at', 'a.update_time'])
+            ->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'])
             ->orderBy('a.pay_at', 'desc')
             ->orderBy('a.create_time', 'desc')
             ->paginate($pageSize);
@@ -71,6 +100,7 @@ class GongdengOrderService extends BaseService
             foreach ($dataList['data'] as &$item) {
                 $item['avatar'] = $item['avatar'] ? get_image_url($item['avatar']) : '';
                 $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'];
                 $item['time_text'] = $time ? format_time(strtotime($time)) : '刚刚';
                 if ($item['is_hide']) {