From 99f0aa17b3f27246625bbf0b81dd2ff3f4657ce5 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Mon, 22 Jul 2024 13:51:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/UserOrderController.php | 4 ++--
 config/code.php                              | 2 ++
 北京国康小程序/api/api.js                    | 2 +-
 北京国康小程序/api/index.js                  | 2 +-
 北京国康报告对比/api/api.js                  | 2 +-
 北京国康报告对比/api/index.js                | 2 +-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/UserOrderController.php b/app/Http/Controllers/UserOrderController.php
index 0bd9776..574861b 100644
--- a/app/Http/Controllers/UserOrderController.php
+++ b/app/Http/Controllers/UserOrderController.php
@@ -302,8 +302,8 @@ class UserOrderController extends Controller
     ]);
     if (count($time_check['data']) != 1) Yo::error_echo(200047);
     if (!!$group_info) {
-      if (strtotime($group_info['start_time'] . ' 00:00:00') > strtotime($time_info->date . ' ' . $time_info->start_time)) Yo::error_echo(200047);
-      if (strtotime($group_info['end_time'] . ' 23:59:59') < strtotime($time_info->date . ' ' . $time_info->end_time)) Yo::error_echo(200047);
+      if (strtotime($group_info['start_time'] . ' 00:00:00') > strtotime($time_info->date . ' ' . $time_info->start_time)) Yo::error_echo(200092);
+      if (strtotime($group_info['end_time'] . ' 23:59:59') < strtotime($time_info->date . ' ' . $time_info->end_time)) Yo::error_echo(200092);
     }
     $true_price = $price;
     //如果是团检判断分组内的统收限额，超过限额的部分收费
diff --git a/config/code.php b/config/code.php
index dfdb876..ea4b96a 100644
--- a/config/code.php
+++ b/config/code.php
@@ -140,4 +140,6 @@ return [
   200089 => '参数不全',
   200090 => '未查询到该用户分诊记录',
   200091 => '调用分诊接口出错',
+
+  200092 => '团检登记时间范围过期',
 ];
diff --git a/北京国康小程序/api/api.js b/北京国康小程序/api/api.js
index f5dca53..f0534c4 100644
--- a/北京国康小程序/api/api.js
+++ b/北京国康小程序/api/api.js
@@ -2,7 +2,7 @@ let url_ = "https://bjgk-api.sixinyun.com";
 let report_url_ = "https://bjgk-api.sixinyun.com";
 //let report_url_ = "http://192.168.31.106:5173";
 let h5_url_ = "https://bjgk-api.sixinyun.com";
-const dev =0;
+const dev =1;
 if (dev === 1) {
 	url_ = "http://beijingguokang";
 	report_url_ = "http://192.168.31.106:5173";
diff --git a/北京国康小程序/api/index.js b/北京国康小程序/api/index.js
index 3e1ab8c..7f8432d 100644
--- a/北京国康小程序/api/index.js
+++ b/北京国康小程序/api/index.js
@@ -4,7 +4,7 @@ import {
 import $api  from './api.js'
 let url_ = "https://bjgk-api.sixinyun.com";
 let chat_url = "https://bjgk-api.sixinyun.com"
-const dev = 0
+const dev = 1
 if (dev === 1) {
 	url_ = "http://beijingguokang"
 	chat_url = "http://192.168.31.106:5173"
diff --git a/北京国康报告对比/api/api.js b/北京国康报告对比/api/api.js
index 353c5b8..b91e174 100644
--- a/北京国康报告对比/api/api.js
+++ b/北京国康报告对比/api/api.js
@@ -1,5 +1,5 @@
 let url_ = "https://bjgk-api.sixinyun.com";
-const dev =0
+const dev =1
 if (dev === 1) {
 	url_ = "http://localhostlanketijian"
 }
diff --git a/北京国康报告对比/api/index.js b/北京国康报告对比/api/index.js
index b82b921..7f8ef41 100644
--- a/北京国康报告对比/api/index.js
+++ b/北京国康报告对比/api/index.js
@@ -2,7 +2,7 @@ import {
 	$post
 } from '@/lu/axios.js'
 let url_ = "https://bjgk-api.sixinyun.com";
-const dev = 0
+const dev = 1
 if (dev === 1) {
 	url_ = "http://localhostlanketijian"
 }