From b4c48bbb89ffdbaea7f45e76c76cef2b0c135299 Mon Sep 17 00:00:00 2001
From: tk <szdot@live.com>
Date: Thu, 11 Jul 2024 14:33:05 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=B1=BB=09=E5=9E=8B=E3=80=91?=
 =?UTF-8?q?=EF=BC=9Afeat=20=E3=80=90=E4=B8=BB=09=E9=A2=98=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=E6=B3=A8=E5=86=8C=E8=88=AA=E7=BA=BF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=20=E3=80=90=E6=8F=8F=09=E8=BF=B0=E3=80=91?=
 =?UTF-8?q?=EF=BC=9A=20=09[=E5=8E=9F=E5=9B=A0]=EF=BC=9A=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E9=87=8D=E5=A4=8Did=20=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2bug=20=09[=E8=BF=87=E7=A8=8B]=EF=BC=9A=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=89=8D=E5=85=88=20=E6=A3=80=E6=9F=A5=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E7=AB=99=E7=82=B9=20=E5=B7=B2=E7=BB=8F=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=9A=84=E8=88=AA=E7=BA=BF=20=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E9=87=8D=E5=A4=8D=E7=9A=84=E9=A3=9E=E6=9C=BAid=20=09[?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D]=EF=BC=9A=20=E3=80=90=E7=BB=93=09=E6=9D=9F?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# 类型 包含:
# feat：新功能（feature）
# fix：修补bug
# docs：文档（documentation）
# style： 格式（不影响代码运行的变动）
# refactor：重构（即不是新增功能，也不是修改bug的代码变动）
# test：增加测试
# chore：构建过程或辅助工具的变动
---
 .../Controller/PlaneController.class.php      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/FlyCube/MpApi/Controller/PlaneController.class.php b/FlyCube/MpApi/Controller/PlaneController.class.php
index 30b7b60..63d9640 100644
--- a/FlyCube/MpApi/Controller/PlaneController.class.php
+++ b/FlyCube/MpApi/Controller/PlaneController.class.php
@@ -157,14 +157,27 @@ class PlaneController extends PublicController
 		}
 	}
 	/**
-	 * @description: 锁定送餐点的航线
+	 * @description: 飞机在站点上注册航线
 	 */
 	public function lockSite()
 	{
 		//总管理员 可接收任何shop_id 非总管理员 只可以调用自身shop_id 否则会中断
 		$this->isPower();
 
-		if ($_REQUEST['id'] && $_REQUEST['runing']) {
+		if ($_REQUEST['id'] && $_REQUEST['plane_id'] && $_REQUEST['runing']) {
+			$rsDb = D('receive_site');
+			$where['id'] = $_REQUEST['id'];
+			$where['shop_id'] = $_REQUEST['shop_id'];
+			//合法检查
+			$rsCheck = $rsDb->where($where)->select();
+			foreach ($rsCheck as $key => $value) {
+				$runingPlanes = explode(',', $value['runing']);
+				if (in_array($_REQUEST['plane_id'], $runingPlanes)) {
+					echo json_encode(array('status' => 0, 'msg' => '此飞机已经组测过航线了'));
+					exit;
+				}
+			}
+			//注册航线
 			if ($_REQUEST['runing'] == "null") {
 				$data['runing'] = null;
 				$msg = "已注销执行航线";
@@ -172,8 +185,7 @@ class PlaneController extends PublicController
 				$data['runing'] = $_REQUEST['runing'];
 				$msg = "已注册执行航线";
 			}
-			$where['id'] = $_REQUEST['id'];
-			$rsDb = D('receive_site');
+
 			if ($rsDb->where($where)->save($data)) {
 				echo json_encode(array('status' => 1, 'msg' => $msg));
 			} else {