Wesmiler

app/Models/MeetingModel.php

@@ -56,6 +56,24 @@ class MeetingModel extends BaseModel
     }
 
     /**
+     * 城市
+     */
+    public function city()
+    {
+        return $this->hasOne(CityModel::class, 'id','city_id')
+            ->where(['mark'=>1]);
+    }
+
+    /**
+     * 区县
+     */
+    public function district()
+    {
+        return $this->hasOne(CityModel::class, 'id','district_id')
+            ->where(['mark'=>1]);
+    }
+
+    /**
      * 签到记录
      * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */

app/Services/Common/MeetingService.php

@@ -15,6 +15,7 @@ use App\Models\ActionLogModel;
 use App\Models\MeetingModel;
 use App\Models\MemberModel;
 use App\Services\BaseService;
+use App\Services\MpService;
 use App\Services\RedisService;
 
 /**
@@ -48,50 +49,6 @@ class MeetingService extends BaseService
         return self::$instance;
     }
 
-    /**
-     * 获取列表
-     */
-    public function getList()
-    {
-        $params = request()->all();
-        $pageSize = $params['limit'] ?? 20;
-        $where = ['member.mark' => 1];
-        $status = isset($params['status']) ? $params['status'] : 0;
-        if ($status > 0) {
-            $where['member.status'] = $status;
-        }
-
-        $query = $this->model->with(['parent', 'account'])
-            ->from('meetings')
-            ->leftJoin('member', 'b.id', '=', 'meetings.user_id')
-            ->where($where)
-            ->where(function ($query) use ($params) {
-                $keyword = isset($params['keyword']) ? $params['keyword'] : '';
-                if ($keyword) {
-                    $query->where('member.nickname', 'like', "%{$keyword}%")->orWhere('member.mobile', 'like', "%{$keyword}%");
-                }
-            })
-            ->select(['meetings.*'])
-            ->withCount(['records'])
-            ->orderBy('meetings.sort', 'desc')
-            ->orderBy('meetings.id', 'desc');
-        $list = $query->paginate($pageSize > 0 ? $pageSize : 9999999);
-        $list = $list ? $list->toArray() : [];
-
-        if ($list) {
-            foreach ($list['data'] as &$item) {
-                $item['thumb'] = $item['thumb'] ? get_image_url($item['thumb']) : '';
-                $item['create_time_text'] = date('Y-m-d H:i:s', (int)$item['create_time']);
-            }
-        }
-
-        return [
-            'code' => 0,
-            'msg' => '获取成功',
-            'data' => isset($list['data']) ? $list['data'] : [],
-            'count' => isset($list['total']) ? $list['total'] : 0
-        ];
-    }
 
     /**
      * 获取数据列表
@@ -116,7 +73,8 @@ class MeetingService extends BaseService
                 });
             }
 
-            $list = $query->with(['member'])
+            $list = $query->with(['member','city','district'])
+                ->withCount(['records'])
                 ->orderBy('sort', 'desc')
                 ->orderBy('id', 'desc')
                 ->paginate($pageSize);
@@ -126,6 +84,15 @@ class MeetingService extends BaseService
             if ($list && isset($list['data'])) {
                 foreach ($list['data'] as &$item) {
                     $item['create_time'] = $item['create_time'] ? datetime($item['create_time'],'Y-m-d H:i:s') : '';
+
+                    $info['qrcode'] = MpService::make()->getMiniQrcode("meet@".$item['id']);
+                    $info['qrcode'] = $info['qrcode']? get_image_url($info['qrcode']):'';
+
+                    $city = isset($item['city'])?$item['city']:[];
+                    $district = isset($item['district'])?$item['district']:[];
+                    $cityName = isset($city['name'])?$city['name']:'';
+                    $districtName = isset($district['name'])?$district['name']:'';
+                    $item['area'] = $cityName.'/'.$districtName;
                 }
             }