wesmiler пре 4 година
родитељ
комит
2bc1b392e6

+ 57 - 0
app/Http/Controllers/Api/v1/EnshrineController.php

@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use App\Http\Controllers\Api\BaseController;
+use App\Services\EnshrineService;
+use Illuminate\Http\Request;
+
+/**
+ * 供奉控制器类
+ * @author wesmiler
+ * @since 2020/11/10
+ * Class EnshrineController
+ * @package App\Http\Controllers
+ */
+class EnshrineController extends BaseController
+{
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * EnshrineController constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+
+        $this->service = new EnshrineService();
+    }
+
+
+    /**
+     * 供奉记录
+     * @return array
+     */
+    public function index(){
+        return $this->service->getDataList($this->userId);
+    }
+
+    /**
+     * 选择佛像
+     * @return mixed
+     */
+    public function select(){
+        return $this->service->select($this->userId);
+    }
+
+    /**
+     * 送圣
+     * @return array
+     */
+    public function packoff(){
+        return $this->service->packoff($this->userId);
+    }
+
+
+}

+ 1 - 24
app/Http/Controllers/Api/v1/FoxiangController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Api\v1;
 
 use App\Http\Controllers\Api\BaseController;
-use App\Services\ConfigService;
 use App\Services\FoxiangCatesService;
 use App\Services\FoxiangService;
 use Illuminate\Http\Request;
@@ -40,35 +39,13 @@ class FoxiangController extends BaseController
         return $this->service->getDataList($params);
     }
 
-    /**
-     * 选择佛像
-     * @return mixed
-     */
-    public function select(){
-        return $this->service->select($this->userId);
-    }
 
     /**
-     * 获取文章分类
+     * 获取分类
      * @return mixed
      */
     public function cates(){
         return $this->cateService->getOptions();
     }
 
-    /**
-     * 供奉记录
-     * @return array
-     */
-    public function enshrineList(){
-        return $this->service->getEnshrineList($this->userId);
-    }
-
-    /**
-     * 送圣
-     * @return array
-     */
-    public function packoff(){
-        return $this->service->packoff($this->userId);
-    }
 }

+ 1 - 1
app/Services/EnshrineOrdersService.php

@@ -14,7 +14,7 @@ namespace App\Services;
 use App\Models\EnshrineOrdersModel;
 
 /**
- * 商城订单管理-服务类
+ * 供奉订单管理-服务类
  * @author wesmiler
  * @since 2020/11/11
  * Class EnshrineOrdersService

+ 194 - 0
app/Services/EnshrineService.php

@@ -0,0 +1,194 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Services;
+
+use App\Models\EnshrineRecordModel;
+use App\Models\MemberModel;
+
+/**
+ * 供奉管理-服务类
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class EnshrineService
+ * @package App\Services
+ */
+class EnshrineService extends BaseService
+{
+
+    protected static $instance = null;
+    /**
+     * 构造函数
+     * @author wesmiler
+     * @since 2020/11/11
+     * EnshrineOrdersService constructor.
+     */
+    public function __construct()
+    {
+        $this->model = new EnshrineRecordModel();
+    }
+
+    /**
+     * 静态入口
+     * @return EnshrineOrdersService|null
+     */
+    public static function make(){
+        if(!self::$instance){
+            self::$instance = new EnshrineOrdersService();
+        }
+        return self::$instance;
+    }
+
+    /**
+     * 供奉记录
+     * @return array
+     */
+    public  function getDataList($userId){
+        $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('enshrine_records as a')
+            ->leftJoin('foxiang as f', 'f.id', '=', 'a.fo_id')
+            ->leftJoin('foxiang_cates as c', 'c.id', '=', 'f.cate_id')
+            ->where(['a.user_id'=> $userId])
+            ->where(function ($query) use ($params) {
+                $query->where(['a.mark'=>1,'a.status'=> 1]);
+
+            })
+            ->select(['a.*', 'f.name','f.thumb','f.image', 'f.file_url','c.name as cate_name'])
+            ->orderBy('a.create_time', 'desc')
+            ->paginate($pageSize);
+
+        $dataList = $dataList ? $dataList->toArray() : [];
+        if ($dataList) {
+            foreach ($dataList['data'] as &$item) {
+                $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
+                $item['image'] = $item['image'] ? get_image_url($item['image']) : '';
+                $item['file_url'] = $item['file_url'] ? get_image_url($item['file_url']) : '';
+                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+                $item['time_close'] = 0;
+                if($item['create_time'] <= date('Y-m-d H:i:s', time()-24*3600)){
+                    $item['time_close'] = 1;
+                }
+                $item['guibai'] = 0;
+                $item['wash'] = 0;
+            }
+            unset($item);
+        }
+
+        return [
+            'code' => 0,
+            'success'=> true,
+            'msg' => '操作成功',
+            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
+            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
+        ];
+    }
+
+    /**
+     * 请佛
+     * @param $userId
+     * @return array
+     */
+    public function select($userId){
+        $id = request()->get('id', 0);
+        if($id <=0){
+            return message('参数错误', false);
+        }
+
+        $foInfo = $this->model::where(['id'=> $id,'mark'=> 1,'status'=> 1])
+            ->select(['id','name'])
+            ->first();
+        if(!$foInfo){
+            return message('佛像不存在,请选择其他佛像', false);
+        }
+
+        $memberInfo = MemberModel::where(['id'=> $userId,'mark'=> 1,'status'=> 1])
+            ->select(['id','nickname'])
+            ->first();
+        if(!$memberInfo){
+            return message('您的账号不可操作或已冻结,请联系客服', false);
+        }
+
+        // 验证是否正在供奉该佛像
+        $type = request()->get('type', 1);
+        $params = request()->all();
+        switch($type){
+            case 1: // 祈福
+                $record = $this->model::where(['fo_id'=> $id,'user_id'=> $userId,'mark'=> 1,'status'=> 1])
+                    ->select(['id','fo_id','user_id'])
+                    ->first();
+                if($record){
+                    return message('抱歉该佛像您正在供奉中,请24小时后再继续供奉或选择其他佛像', false);
+                }
+                break;
+            case 2: // 超度
+                break;
+            case 3: // 放生
+                break;
+        }
+
+        $data = [
+            'fo_id'=> $id,
+            'type'=> $type,
+            'user_id'=> $userId,
+            'used_name'=> isset($params['used_name'])? trim($params['used_name']) : '',
+            'user_name'=> isset($params['user_name'])? trim($params['user_name']) : '',
+            'relation'=> isset($params['relation'])? trim($params['relation']) : '',
+            'description'=> isset($params['description'])? trim($params['description']) : '',
+            'image'=> isset($params['image'])? trim($params['image']) : '',
+            'create_time'=> time(),
+            'update_time'=> time(),
+            'mark'=> 1,
+            'status'=> 1,
+        ];
+
+        if($this->model::insertGetId($data)){
+            return message('请佛成功',true);
+        }else{
+            return message('请佛失败',true);
+        }
+    }
+
+
+    /**
+     * 送圣
+     * @param $userId
+     * @return array
+     */
+    public function packoff($userId){
+        $id = request()->get('id', 0);
+        $type = request()->get('type', 0);
+
+        if(!$id || !$type){
+            return message('参数错误', false);
+        }
+
+
+        $enshrine = $this->model::where(['fo_id'=> $id, 'user_id'=> $userId,'type'=> $type,'mark'=> 1,'status'=> 1])
+            ->select(['id','fo_id','user_id','status'])
+            ->first();
+        if(!$enshrine){
+            return message('佛像信息不存在', false);
+        }
+
+        $enshrine->status = 2;
+        if($enshrine->save()){
+            return message('送圣成功', true);
+        }else{
+            return message('送圣失败', false);
+        }
+
+    }
+}

+ 0 - 134
app/Services/FoxiangService.php

@@ -173,142 +173,8 @@ class FoxiangService extends BaseService
         return parent::edit($data); // TODO: Change the autogenerated stub
     }
 
-    public function select($userId){
-        $id = request()->get('id', 0);
-        if($id <=0){
-            return message('参数错误', false);
-        }
-
-        $foInfo = $this->model::where(['id'=> $id,'mark'=> 1,'status'=> 1])
-            ->select(['id','name'])
-            ->first();
-        if(!$foInfo){
-            return message('佛像不存在,请选择其他佛像', false);
-        }
-
-        $memberInfo = MemberModel::where(['id'=> $userId,'mark'=> 1,'status'=> 1])
-            ->select(['id','nickname'])
-            ->first();
-        if(!$memberInfo){
-            return message('您的账号不可操作或已冻结,请联系客服', false);
-        }
-
-        // 验证是否正在供奉该佛像
-        $type = request()->get('type', 1);
-        $params = request()->all();
-        switch($type){
-            case 1: // 祈福
-                $record = EnshrineRecordModel::where(['fo_id'=> $id,'user_id'=> $userId,'mark'=> 1,'status'=> 1])
-                    ->select(['id','fo_id','user_id'])
-                    ->first();
-                if($record){
-                    return message('抱歉该佛像您正在供奉中,请24小时后再继续供奉或选择其他佛像', false);
-                }
-                break;
-            case 2: // 超度
-                break;
-            case 3: // 放生
-                break;
-        }
-
-        $data = [
-            'fo_id'=> $id,
-            'type'=> $type,
-            'user_id'=> $userId,
-            'used_name'=> isset($params['used_name'])? trim($params['used_name']) : '',
-            'user_name'=> isset($params['user_name'])? trim($params['user_name']) : '',
-            'relation'=> isset($params['relation'])? trim($params['relation']) : '',
-            'description'=> isset($params['description'])? trim($params['description']) : '',
-            'image'=> isset($params['image'])? trim($params['image']) : '',
-            'create_time'=> time(),
-            'update_time'=> time(),
-            'mark'=> 1,
-            'status'=> 1,
-        ];
-
-        if(EnshrineRecordModel::insertGetId($data)){
-            return message('请佛成功',true);
-        }else{
-            return message('请佛失败',true);
-        }
-    }
-
-    /**
-     * 供奉记录
-     * @return array
-     */
-    public  function getEnshrineList($userId){
-        $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('enshrine_records as a')
-            ->leftJoin('foxiang as f', 'f.id', '=', 'a.fo_id')
-            ->leftJoin('foxiang_cates as c', 'c.id', '=', 'f.cate_id')
-            ->where(['a.user_id'=> $userId])
-            ->where(function ($query) use ($params) {
-                $query->where(['a.mark'=>1,'a.status'=> 1]);
-
-            })
-            ->select(['a.*', 'f.name','f.thumb','f.image', 'f.file_url','c.name as cate_name'])
-            ->orderBy('a.create_time', 'desc')
-            ->paginate($pageSize);
-
-        $dataList = $dataList ? $dataList->toArray() : [];
-        if ($dataList) {
-            foreach ($dataList['data'] as &$item) {
-                $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
-                $item['image'] = $item['image'] ? get_image_url($item['image']) : '';
-                $item['file_url'] = $item['file_url'] ? get_image_url($item['file_url']) : '';
-                $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
-                $item['time_close'] = 0;
-                if($item['create_time'] <= date('Y-m-d H:i:s', time()-24*3600)){
-                    $item['time_close'] = 1;
-                }
-                $item['guibai'] = 0;
-                $item['wash'] = 0;
-            }
-            unset($item);
-        }
 
-        return [
-            'code' => 0,
-            'success'=> true,
-            'msg' => '操作成功',
-            'count' => isset($dataList['total']) ? $dataList['total'] : 0,
-            'data' => isset($dataList['data']) ? $dataList['data'] : 0,
-        ];
-    }
-
-    /**
-     * 送圣
-     * @param $userId
-     * @return array
-     */
-    public function packoff($userId){
-        $id = request()->get('id', 0);
-        $type = request()->get('type', 0);
-
-        if(!$id || !$type){
-            return message('参数错误', false);
-        }
 
 
-        $enshrine = EnshrineRecordModel::where(['fo_id'=> $id, 'user_id'=> $userId,'type'=> $type,'mark'=> 1,'status'=> 1])
-            ->select(['id','fo_id','user_id','status'])
-            ->first();
-        if(!$enshrine){
-            return message('佛像信息不存在', false);
-        }
 
-        $enshrine->status = 2;
-        if($enshrine->save()){
-            return message('送圣成功', true);
-        }else{
-            return message('送圣失败', false);
-        }
-
-    }
 }

+ 5 - 4
routes/api.php

@@ -151,10 +151,11 @@ Route::post('/orders/exchange', [\App\Http\Controllers\Api\v1\OrderController::c
 // 佛像
 Route::post('/foxiang/list', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'index']);
 Route::post('/foxiang/info', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'info']);
-Route::post('/foxiang/select', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'select']);
 Route::post('/foxiang/cates', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'cates']);
-Route::post('/foxiang/enshrine', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'enshrineList']);
-Route::post('/foxiang/packoff', [\App\Http\Controllers\Api\v1\FoxiangController::class, 'packoff']);
-
 
+// 供奉
+Route::post('/enshrine/list', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'index']);
+Route::post('/enshrine/select', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'select']);
+Route::post('/enshrine/packoff', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'packoff']);
+Route::post('/enshrine/goods', [\App\Http\Controllers\Api\v1\EnshrineController::class, 'goods']);