From 1ce68427c1d414c39261a26bca710fbf4fd9a6e5 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期四, 14 八月 2025 09:56:11 +0800
Subject: [PATCH] feat:新增旧单据编号搜索单据和修改福祉车价格计算

---
 API/v3/OrderPrice.gds |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/API/v3/OrderPrice.gds b/API/v3/OrderPrice.gds
index e0e70a8..8ceb106 100644
--- a/API/v3/OrderPrice.gds
+++ b/API/v3/OrderPrice.gds
@@ -287,37 +287,47 @@
 		If IRid<>0 Then
 			'鎵嬪姩鎶ヤ环
 			If InStr(Address,"鐧戒簯鏈哄満")>0 Or InStr(Address,"鐧戒簯鍥介檯鏈哄満")>0 Then
-				IRPrice=489
+				IRPrice=298
 				IRlimit1=5
 				IRDtPrice=6	
 			ElseIf InStr(Address,"骞垮窞鍗楃珯")>0 Then
-				IRPrice=389
+				IRPrice=298
 				IRlimit1=5
 				IRDtPrice=6
 			ElseIf InStr(Address,"骞垮窞鐧戒簯绔�")>0 Then
-				IRPrice=389
+				IRPrice=298
 				IRlimit1=5
 				IRDtPrice=6
 			ElseIf InStr(Address,"骞垮窞涓滅珯")>0 Then
-				IRPrice=359
+				IRPrice=298
 				IRlimit1=5
 				IRDtPrice=6
 			'ElseIf StartArea="鐧戒簯鍖�" Then
 			'	IRPrice=99
 			'	IRlimit1=5
 			'	IRDtPrice=6
-			elseIf StartArea="瓒婄鍖�" Or StartArea="鑽旀咕鍖�" Or StartArea="娴风彔鍖�" Or StartArea="澶╂渤鍖�" Or StartArea="鐣鍖�" Or StartArea="榛勫煍鍖�"  Or StartArea="鐧戒簯鍖�" Then
-				IRPrice=169
+			elseIf StartArea="瓒婄鍖�" Or StartArea="鑽旀咕鍖�" Or StartArea="娴风彔鍖�" Or StartArea="澶╂渤鍖�"  Or StartArea="榛勫煍鍖�"  Or StartArea="鐧戒簯鍖�" Then
+				IRPrice=99
+				IRlimit1=5
+				IRDtPrice=6
+			elseif StartArea="鐣鍖�" Then
+				IRPrice=99
 				IRlimit1=5
 				IRDtPrice=6
 			ElseIf StartArea="鑺遍兘鍖�" Then
-				IRPrice=319
+				IRPrice=99
 				IRlimit1=5
 				IRDtPrice=6
-			ElseIf StartArea="澧炲煄鍖�" Then
-				IRPrice=359
+			ElseIf StartArea="澧炲煄鍖�" And  Isluxury="0" Then
+				IRPrice=99
 				IRlimit1=5
 				IRDtPrice=6
+				IsOrdinary="1"
+			Elseif StartArea="澧炲煄鍖�" And  Isluxury="1" Then
+				IRPrice=99
+				IRlimit1=5
+				IRDtPrice=6
+				IsOrdinary="1"
 			ElseIf StartArea="浠庡寲鍖�" Then
 				IRPrice=359
 				IRlimit1=5
@@ -328,7 +338,7 @@
 				IRDtPrice=6
 				IsOrdinary="1"
 			ElseIf StartArea="鍗楁矙鍖�" And Isluxury="1" Then
-				IRPrice=359
+				IRPrice=99
 				IRlimit1=5
 				IRDtPrice=6
 				IsOrdinary="1"
@@ -380,7 +390,7 @@
 				OrderPriceFRM = OrderPriceFRM & "+"&WaitingInt&"*"&IRWaitingCost
 				OrderPriceTXT = OrderPriceTXT&"绛夊緟璐圭敤:"&WaitingInt*IRWaitingCost&"鍏僜n"
 			End If
-			If ServiceOrdApptDate<>"" Then	'闈炲伐浣滄椂闂存湇鍔¤垂鐢紝鍛ㄤ竴~浜旂殑0800-2000 1.3鍊�
+			If ServiceOrdApptDate<>"" Then	'闈炲伐浣滄椂闂存湇鍔¤垂鐢�20250812锛屽懆涓�~鍛ㄤ簲鏅氫笂21鐐�30鍒嗗悗鑷虫棭涓�7鐐规暣鍓嶄负1.3鍊�
 				sql="select SpecialRatio from SpecialDates where SpecialDates='"&formatdatetime(ServiceOrdApptDate,2)&"'"
 				rs.open sql,objConn,1,1
 				if not rs.Eof Then
@@ -388,7 +398,7 @@
 					OrderPriceFRM = OrderPriceFRM & OrderPrice*(SpecialRatio-1)
 					OrderPriceTXT = OrderPriceTXT&"鑺傚亣鏃ユ椂闂存湇鍔¤垂鐢�:"&OrderPrice*(SpecialRatio-1)&"鍏僜n"
 					OrderPrice=OrderPrice*SpecialRatio
-				ElseIf (hour(ServiceOrdApptDate)<=8 Or hour(ServiceOrdApptDate)>=20)  Then
+				ElseIf (hour(ServiceOrdApptDate)>=21 And minute(ServiceOrdApptDate)>=30) Or hour(ServiceOrdApptDate)<7  Then
 					OrderPriceFRM = OrderPriceFRM & OrderPrice*0.3
 					OrderPriceTXT = OrderPriceTXT&"闈炲伐浣滄椂闂存湇鍔¤垂鐢�:"&OrderPrice*0.3&"鍏僜n"
 					OrderPrice=OrderPrice*1.3

--
Gitblit v1.9.1