fix bug

application/api/controller/User.php

@@ -321,8 +321,8 @@ class User extends Api
             $this->error("动态不存在!");
         if (is_null($text))
             $this->error("评论内容不能为空!");
-        $text = preg_replace('/(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\s*\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?/','***********',$text); // extract phonenumber
-        $switch = config("site.dynamic_publish_check_switch");
+        $text = preg_replace('/(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\s*\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?/', '***********', $text); // extract phonenumber
+        $switch = false;//config("site.dynamic_publish_check_switch");
         Comment::create([
             "user_id" => $user["id"],
             "dynamic_id" => $dynamic["id"],

application/api/model/massager/Massager.php

@@ -62,15 +62,6 @@ class Massager extends BaseModel
             if ($service) {
                 $query->where("level", $service["level"]);
             }
-            // 获取线上技师 - 68元特惠价 必须在扫码10分钟内 登录app查看 只有当选择了服务的时候 才会去判断 该技师是否绑定了该门店
-            if ($service_id == 276) {
-                if ($user_id) {
-                    $exist = RedisClient::of()->get("scan:qr:codes:" . $user_id);
-                    if ($exist) {
-                        $query->where("store_id", $exist);
-                    }
-                }
-            }
         }
         if ($level !== null && (int)$level === 0) {
             $query->where("level", $level);
@@ -81,7 +72,7 @@ class Massager extends BaseModel
             $query->where('hot', 1);
         if ($free_travel)
             $query->where('free_travel', 1);
-        $query->order("online", "desc");
+        $query->order("online", "DESC");
         switch ($sort) {
             case "weight": // 默认排序
                 $query->order("weight", "DESC");
@@ -102,7 +93,7 @@ class Massager extends BaseModel
                 $query->order('createtime', 'DESC');
                 break;
         }
-        return $paginate = $query
+        return $query
             ->with(['store', 'nearly_two_days_orders'])
             ->page($page)
             ->paginate($size);

application/api/service/MassagerService.php

@@ -66,7 +66,7 @@ class MassagerService extends BaseService
             }, $item["nearly_two_days_orders"]), true);
             $item['recently_work_date'] = $recently_work_date;
             $item['is_can_collet'] = !isset($collet_relation[$item['id']]);
-            $item["price"] = isset($services[$item['level']]) ? $services[$item['level']] : 260;
+            $item["price"] = $services[$item['level']] ?? 260;
             unset($item['nearly_two_days_orders']);
         }
         return [
@@ -119,7 +119,7 @@ class MassagerService extends BaseService
             $y_m_d_h = date("Y-m-d H:00:00", $acc_time);
             $v_1 = [
                 "value" => date("H:00", strtotime($y_m_d_h)),
-                "can_option" => (($acc_time - (60 * 60)) === $now_time) ? false : $this->checkCanOption(strtotime($y_m_d_h), $order_date_range)
+                "can_option" => !(($acc_time - (60 * 60)) === $now_time) && $this->checkCanOption(strtotime($y_m_d_h), $order_date_range)
             ];
             $v_2 = [
                 "value" => date("H:30", $acc_time),
@@ -272,12 +272,8 @@ class MassagerService extends BaseService
         $available_services = [];
         foreach ($items as &$item) {
             $item["membership_discount_price"] = fixed2Float($item["real_price"] * $membership_discount_rate);
-            if ($item["id"] != 276) {
+            if ($massager["store_id"] == $exist && $exist > 0) {
                 $available_services[] = $item;
-            } else {
-                if ($massager["store_id"] == $exist && $exist > 0) {
-                    $available_services[] = $item;
-                }
             }
         }
         $massager["services"] = $available_services;