first

application/api/controller/Hotel.php

@@ -32,19 +32,26 @@ class Hotel extends Api
     public function list()
     {
         $params = $this->request->param();
-        $params['sort_type'] = !empty($params['sort_type']) ? $params['sort_type'] : 1;
+        $params['sort_distance'] = !empty($params['sort_distance']) ? $params['sort_distance'] : 1;
+        $params['sort_price'] = !empty($params['sort_price']) ? $params['sort_price'] : 1;
         $field = ['id','name','image','price','original_price','tags','lat','lng'];
         if (!empty($params['lng']) && !empty($params['lng'])){
             $field[] = "(st_distance(point ({$params['lng']}, {$params['lat']}),point(lng,lat))*111195) as distance";
         }
         $query    = HotelModel::field($field);
 
-        if (!empty($params['lng']) && !empty($params['lng']) && $params['sort_type'] == 1){
-            $query->order('distance asc');
+        if (!empty($params['lng']) && !empty($params['lng'])){
+            if ($params['sort_distance'] == 1){
+                $query->order('distance asc');
+            }else{
+                $query->order('distance desc');
+            }
         }
 
-        if ($params['sort_type'] == 2){
+        if ($params['sort_type'] == 1){
             $query->order('price asc');
+        }else{
+            $query->order('price desc');
         }
 
         $list = $query->where('status', 1)
@@ -186,7 +193,7 @@ class Hotel extends Api
         return $this->success('获取成功',$list);
     }
 
-    // 订单取消
+    // 订单取消  2:79 - 10 = 69    4:65 - 10 = 55  6:50 - 10 = 40
     public function applyCancel()
     {
         $params = $this->request->param();

application/common/model/HotelCanteenModel.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\common\model;
+
+use think\Db;
+use think\Model;
+
+/**
+ * 群组
+ */
+class HotelCanteenModel extends Model
+{
+    // 表名
+    protected $name = 'hotel_canteen';
+    // 开启自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    public function getImageAttr($value, $data)
+    {
+        return cdnurl($value);
+    }
+
+    public function getImagesAttr($value, $data)
+    {
+        $value = explode(',',$value);
+        foreach ($value as &$v){
+            $v = cdnurl($v);
+        }
+        return $value;
+    }
+
+    public function room()
+    {
+        return $this->hasOne(HotelCanteenRoomModel::class, 'canteen_id', 'id');
+    }
+}

application/common/model/HotelCanteenRoomModel.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace app\common\model;
+
+use think\Db;
+use think\Model;
+
+/**
+ * 群组
+ */
+class HotelCanteenRoomModel extends Model
+{
+    // 表名
+    protected $name = 'hotel_room';
+    // 开启自动写入时间戳字段
+    protected $autoWriteTimestamp = false;
+    // 定义时间戳字段名
+    protected $createTime = false;
+    protected $updateTime = false;
+    protected $deleteTime = false;
+
+    public function getImageAttr($value, $data)
+    {
+        return cdnurl($value);
+    }
+
+    public function getImagesAttr($value, $data)
+    {
+        $value = explode(',',$value);
+        foreach ($value as &$v){
+            $v = cdnurl($v);
+        }
+        return $value;
+    }
+
+    public function canteen()
+    {
+        return $this->hasOne(HotelCanteenModel::class, 'id', 'canteen_id');
+    }
+}