wesmiler 报恩寺项目提交

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

@@ -63,7 +63,7 @@ class EnshrineController extends BaseController
     }
 
     /**
-     * 供奉操作记录
+     * 保存供奉操作记录
      * @return array
      */
     public function actionRecord(){
@@ -71,6 +71,14 @@ class EnshrineController extends BaseController
     }
 
     /**
+     * 供奉操作记录
+     * @return array
+     */
+    public function xinyuan(){
+        return $this->service->actionList($this->userId);
+    }
+
+    /**
      * 购买物品
      * @return array
      */

app/Services/EnshrineService.php

@@ -180,8 +180,6 @@ class EnshrineService extends BaseService
         $params = request()->all();
         $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
         $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
-        $size = ConfigService::make()->getConfigByCode('qifu_limit');
-        $pageSize = $size? $size : $pageSize;
 
         $dataList = $this->model::from('offerings as a')
             ->where(function ($query) use ($params) {
@@ -565,4 +563,40 @@ class EnshrineService extends BaseService
             return message("操作成功", true);
         }
     }
+
+    /**
+     * 心愿记录
+     * @param $userId
+     * @return array
+     */
+    public function actionList($userId){
+        $params = request()->all();
+        $page = isset($params['pageSize']) ? intval($params['pageSize']) : PAGE;
+        $pageSize = isset($params['pageSize']) ? intval($params['pageSize']) : PERPAGE;
+
+        $dataList = $this->model::from('enshrine_actions as a')
+            ->where(['a.type'=> 3,'a.mark'=>1,'a.status'=> 1,'a.user_id'=> $userId])
+            ->select(['a.*'])
+            ->orderBy('a.sort', 'asc')
+            ->orderBy('a.create_time', 'desc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+                $item['description'] = $item['description']? str_replace("\n",'<br>', $item['description']) : '';
+            }
+            unset($item);
+        }
+
+        return [
+            'code' => 0,
+            'success'=> true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
+
+    }
 }

routes/api.php

@@ -160,4 +160,5 @@ Route::post('/enshrine/packoff', [\App\Http\Controllers\Api\v1\EnshrineControlle
 Route::post('/enshrine/goods', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'goods']);
 Route::post('/enshrine/buy', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'buy']);
 Route::post('/enshrine/action', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'actionRecord']);
+Route::post('/enshrine/xinyuan', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'xinyuan']);