wesmiler 报恩寺项目提交

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

@@ -40,7 +40,8 @@ class MemberController extends BaseController
      * @return array|mixed
      */
     public function info(){
-        $info = $this->service->getUserInfo(['m.id'=> $this->userId],'',1);
+        $type = request()->get('type', 1);
+        $info = $this->service->getUserInfo(['m.id'=> $this->userId],'',$type);
         return message(MESSAGE_OK,true, $info);
     }
 

app/Models/MasterModel.php

@@ -0,0 +1,40 @@
+<?php
+// +----------------------------------------------------------------------
+// | Laravel框架 [ Laravel ]
+// +----------------------------------------------------------------------
+// | 版权所有 2017~2021 Laravel研发中心
+// +----------------------------------------------------------------------
+// | 官方网站: http://www.laravel.cn
+// +----------------------------------------------------------------------
+// | Author: wesmiler <12345678@qq.com>
+// +----------------------------------------------------------------------
+
+namespace App\Models;
+
+/**
+ * 法师管理-模型
+ * @author wesmiler
+ * @since 2020/11/11
+ * Class MasterModel
+ * @package App\Models
+ */
+class MasterModel extends BaseModel
+{
+    // 设置数据表
+    protected $table = 'master';
+
+    /**
+     * 获取记录信息
+     * @param int $id 记录ID
+     * @return array|string
+     * @author wesmiler
+     * @since 2020/11/11
+     */
+    public function getInfo($id)
+    {
+        $info = parent::getInfo($id); // TODO: Change the autogenerated stub
+
+        return $info;
+    }
+
+}

app/Services/MemberService.php

@@ -14,6 +14,7 @@ namespace App\Services;
 use App\Models\CityModel;
 use App\Models\FansModel;
 use App\Models\FollowModel;
+use App\Models\MasterModel;
 use App\Models\MemberModel;
 use App\Models\SiyuanModel;
 use App\Models\TradeModel;
@@ -149,6 +150,12 @@ class MemberService extends BaseService
                 $info['yg_siyuan'] = $info['siyuan_id']? SiyuanModel::where('id', $info['siyuan_id'])->value('title') : '';
             }
 
+            if($type == 2){
+                $master = MasterModel::where(['user_id'=> $info['id'],'mark'=> 1,'status'=> 1])
+                    ->first();
+                $info['master'] = $master;
+            }
+
             if($type == 1) {
 
                 // 城市

app/Services/OrdersService.php

@@ -110,7 +110,7 @@ class OrdersService extends BaseService
             ->leftJoin('express as es', 'es.express_code', '=', 'o.express_code')
             ->where(['o.user_id'=> $userId,'o.mark'=> 1])
             ->where('o.status','>', 0)
-            ->select(['o.*','g.title as goods_name','g.thumb','m.nickname','m.mobile','es.name as express_company'])
+            ->select(['o.*','g.title as goods_name','g.thumb','g.specs','m.nickname','m.mobile','es.name as express_company'])
             ->orderBy('o.create_time', 'desc')
             ->paginate($pageSize);