From 82954f31a43d8f6c2c76b24bf09fd45502c24638 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:34:18 +0800
Subject: [PATCH] 解决合并冲突
---
API/v3/OrderPrice.gds | 12 +++---
API/v1/SendSms.php | 43 ++++++++++++++++++---
API/User/index.gds | 30 ++++++++++++++
3 files changed, 72 insertions(+), 13 deletions(-)
diff --git a/API/User/index.gds b/API/User/index.gds
index 5748770..7d7f0ba 100644
--- a/API/User/index.gds
+++ b/API/User/index.gds
@@ -85,6 +85,16 @@
End If
'绛惧悕楠岃瘉---end
+Function saveCoupon(objConn,Money,UserID,Remarks,Name)
+ CouponNO=DTimeID()&getIDnumbers(6)
+ CouponMoney=Money
+ CouponRemarks=Remarks
+ CouponName=Name
+ If UserID="" Then UserID=0
+ sql="Insert into Coupon (CouponNO,CouponName,CouponMoney,CouponDate_Ent,CouponRemarks,ServiceOrdIDPK,ToUserID) values ('"&CouponNO&"','"&CouponName&"',"&CouponMoney&",getdate()+365*2,'"&CouponRemarks&"',0,"&UserID&")"
+ objConn.Execute sql
+End Function
+
objConn.BeginTrans
If errcode="" then
@@ -163,6 +173,8 @@
ADUser="155"
ElseIf UserSourceSP(i)="Iid166" Then
ADUser="166"
+ ElseIf UserSourceSP(i)="Iid193" Then
+ ADUser="193"
End If
End If
Next
@@ -427,7 +439,21 @@
NewUserCoupon=0
End If
- If (ADUser="153") And NewUser=1 And DateDiff("d",now(),"2023-9-15")<=0 And DateDiff("d",now(),"2024-6-30")>=0 Then
+ if (ADUser="193") And DateDiff("d",now(),"2025-9-5")<=0 And DateDiff("d",now(),"2028-1-1")>=0 Then
+ sql="select * from Coupon where CouponDate_Ent>=getdate() and CouponName like '鍩庡競鏈嶅姟 浼樻儬%' and ToUserID="&UserID
+ rs.open Sql,objConn,1,1
+ If rs.Eof then
+ '鍏氦杞﹀箍鍛婁紭鎯�
+ '鍩庡競鏈嶅姟浼樻儬 鍙戜紭鎯犲埜锛� 甯傚唴50 鐪佸唴200 鐪佸500 楂橀搧1000 鑸┖3000
+ saveCoupon objConn,50,UserID,"","鍩庡競鏈嶅姟 浼樻儬 50鍏冧唬閲戝埜-锛堟湰甯傝鏀垮尯鍩熷唴鏁戞姢杞﹁浆杩愬彲浣跨敤锛�"
+ saveCoupon objConn,50,UserID,"","鍩庡競鏈嶅姟 浼樻儬 50鍏冧唬閲戝埜-锛堟湰甯傝鏀垮尯鍩熷唴鏁戞姢杞﹁浆杩愬彲浣跨敤锛�"
+ saveCoupon objConn,200,UserID,"","鍩庡競鏈嶅姟 浼樻儬 200鍏冧唬閲戝埜-锛堝崟绋嬭窛绂�100鍏噷浠ヤ笂鏁戞姢杞﹁浆杩愬彲浣跨敤锛�"
+ saveCoupon objConn,500,UserID,"","鍩庡競鏈嶅姟 浼樻儬 500鍏冧唬閲戝埜-锛堝崟绋嬭窛绂�500鍏噷浠ヤ笂鏁戞姢杞﹁浆杩愬彲浣跨敤锛�"
+ saveCoupon objConn,1000,UserID,"","鍩庡競鏈嶅姟 浼樻儬 1000鍏冧唬閲戝埜-锛堥珮閾佸尰鐤楄浆杩愬彲浣跨敤锛�"
+ saveCoupon objConn,3000,UserID,"","鍩庡競鏈嶅姟 浼樻儬 3000鍏冧唬閲戝埜-锛堣埅绌哄尰鐤楄浆杩愬彲浣跨敤锛�"
+ End if
+ rs.close()
+ ElseIf (ADUser="153") And NewUser=1 And DateDiff("d",now(),"2023-9-15")<=0 And DateDiff("d",now(),"2024-6-30")>=0 Then
sql="select * from Coupon where CouponDate_Ent>=getdate() and CouponName like '鍩庡競鏈嶅姟浼樻儬%' and ToUserID="&UserID
rs.open Sql,objConn,1,1
If rs.Eof then
@@ -934,6 +960,8 @@
webJson="""UserInformation"":{""Title"":""鐢ㄦ埛浼樻儬鍒�"",""Content"":"""",""PicUrl"":""https://api.966120.com.cn/OA_img/20231013160503.png"",""Url"":""/pages/my/login/login"",""OpenType"":""navigateTo""}"
ElseIf UserID<>"0" And FormIDInt=0 And (InStr(pages,"148")>0 Or InStr(pages,"155")>0 Or InStr(CouponNames,"浠ｉ噾鍒�")>0) Then
webJson="""UserInformation"":{""Title"":""鐢ㄦ埛浼樻儬鍒�"",""Content"":"""",""PicUrl"":""https://api.966120.com.cn/OA_img/ad_20230727.png"",""Url"":"""",""OpenType"":""""}"
+ ElseIf wxOpenid<>"" and FormIDInt=0 and (InStr(pages,"193")>0 or InStr(CouponNames,"浠ｉ噾鍒�")>0) then
+ webJson="""UserInformation"":{""Title"":""鐢ㄦ埛浼樻儬鍒�"",""Content"":""&pages&"",""PicUrl"":""https://api.966120.com.cn/OA_img/ad_0904.png"",""Url"":"""",""OpenType"":""""}"
Else
webJson="""UserInformation"":0"
End If
diff --git a/API/v1/SendSms.php b/API/v1/SendSms.php
index 0694d6c..fe9cb84 100644
--- a/API/v1/SendSms.php
+++ b/API/v1/SendSms.php
@@ -100,8 +100,9 @@
}
function sendPayUrl($phone,$name,$payurl){
- $payurl="wx.966120.com.cn/?n=".$payurl;
- $content='銆愬箍涓滄皯鑸尰鐤椼�戠Щ鍔ㄦ敮浠樻寚寮曪細'.$name.'鎮ㄥソ锛佽鐐瑰嚮浠ヤ笅閾炬帴杩涘叆淇℃伅纭鍜屾敮浠樼晫闈€�傛牳瀵规偍鐨勫嚭杞︿俊鎭棤璇悗锛屽彲閫夋嫨鏀粯瀹濇垨鑰呭井淇℃敮浠橈細' .$payurl;
+ $paycode=$payurl;
+ $payurl="wx.966120.com.cn";
+ $content='銆愬箍涓滄皯鑸尰鐤椼�戠Щ鍔ㄦ敮浠樻寚寮曪細'.$name.'鎮ㄥソ锛佽鐐瑰嚮浠ヤ笅閾炬帴杩涘叆淇℃伅纭鍜屾敮浠樼晫闈€�傛牳瀵规偍鐨勫嚭杞︿俊鎭棤璇悗锛屽彲閫夋嫨鏀粯瀹濇垨鑰呭井淇℃敮浠橈細' .$payurl.' 鐧诲綍鐮侊細'.$paycode;
// echo $content;
require './sms/SmsSend.php';
$sms = new SmsSend('gdmhhy', 'lLsZyz3YVYKQ');
@@ -109,6 +110,27 @@
// print_r($result);
return $result;
+}
+function sendValidate($phone,$code){
+ $content='銆愬箍涓滄皯鑸尰鐤椼�戦獙璇佺爜锛�'.$code.'锛屾偍姝ｅ湪鐧诲綍锛岃嫢闈炴湰浜烘搷浣滐紝璇峰嬁娉勯湶.';
+ require './sms/SmsSend.php';
+ $sms = new SmsSend('gdmhhy', 'lLsZyz3YVYKQ');
+ $result = $sms->sendSmsOne([['phone' => $phone, 'content' => $content]], '');
+ return $result;
+}
+function sendCallCar($phone,$UserName,$CarLicense){
+ $content='銆愬箍涓滄皯鑸尰鐤椼�戞偍棰勮鐨勬晳鎶よ溅宸茬粡鍑哄彂銆傝礋璐ｄ汉'.$UserName.'锛岃溅鐗�'.$CarLicense.'銆傝鎮ㄧ暀鎰忓苟鎻愰槻鍋囧啋銆傛杩庡叧娉ㄢ��966120姘戣埅鍖荤枟蹇嚎鈥濆井淇℃湇鍔″彿锛屽彲鏌ョ湅鏈稛杞繍淇℃伅锛屽苟鍒嗕韩杞﹁締鐨勫疄鏃朵綅缃粰浜插弸銆�';
+ require './sms/SmsSend.php';
+ $sms = new SmsSend('gdmhhy', 'lLsZyz3YVYKQ');
+ $result = $sms->sendSmsOne([['phone' => $phone, 'content' => $content]], '');
+ return $result;
+}
+function sendPayOK($phone,$name,$m1,$d1,$m2){
+ $content='銆愬箍涓滄皯鑸尰鐤椼��'.$name.'鎮ㄥソ锛佹偍宸叉敮浠樹簡瀹氶噾'.$m1.'鍏冿紝鎴戜滑鐨勬湇鍔″洟闃熷埌杈惧嚭鍙戝湴'.$d1.'鍚庯紝灏嗘敹榻愪綑涓�'.$m2.'鍏冨悗鍐嶅嚭鍙戙�傚闇�鍙戠エ锛岃鍏虫敞鈥�966120姘戣埅鍖荤枟蹇嚎鈥濓紝浠诲姟缁撴潫鍚庡湪鈥滄垜鐨勨��--鈥滃彂绁ㄧ敵璇封�濆鐢宠銆傚鏈嶅姟鍥㈤槦宸茬粡鍑鸿溅锛岃瀹氶噾鏃犳硶閫�鍥烇紝璇风煡鎮夈�傛湁鐤戦棶娆㈣繋闅忔椂鎷ㄦ墦鏈嶅姟鐑嚎 (020) 966120锛岃阿璋紒';
+ require './sms/SmsSend.php';
+ $sms = new SmsSend('gdmhhy', 'lLsZyz3YVYKQ');
+ $result = $sms->sendSmsOne([['phone' => $phone, 'content' => $content]], '');
+ return $result;
}
// 璋冪敤绀轰緥锛�
set_time_limit(0);
@@ -124,7 +146,7 @@
//鏀粯鎸囧紩
$name=empty($_REQUEST['name'])!=false ? "" : addslashes($_REQUEST['name']); //鍐呭--濮撳悕
$payurl=empty($_REQUEST['payurl'])!=false ? "" : addslashes($_REQUEST['payurl']); //鍐呭--鐭摼鎺ラ獙璇佺爜
- $codejson=json_encode(array("name"=>$name,"payurl"=>$payurl), JSON_UNESCAPED_UNICODE);
+ // $codejson=json_encode(array("name"=>$name,"payurl"=>$payurl), JSON_UNESCAPED_UNICODE);
$result=sendPayUrl($Phone,$name,$payurl);
echo json_encode($result);
return;
@@ -133,7 +155,10 @@
//鍑鸿溅鐭俊
$UserName=empty($_REQUEST['UserName'])!=false ? "" : addslashes($_REQUEST['UserName']); //鍐呭--璐熻矗浜�
$CarLicense=empty($_REQUEST['CarLicense'])!=false ? "" : addslashes($_REQUEST['CarLicense']); //鍐呭--杞︾墝
- $codejson=json_encode(array("UserName"=>$UserName,"CarLicense"=>$CarLicense), JSON_UNESCAPED_UNICODE);
+ // $codejson=json_encode(array("UserName"=>$UserName,"CarLicense"=>$CarLicense), JSON_UNESCAPED_UNICODE);
+ $result=sendCallCar($Phone,$UserName,$CarLicense);
+ echo json_encode($result);
+ return;
}elseif ($lateCode=="SMS_219737201") {
//璇勪环鐭俊
$payurl=empty($_REQUEST['payurl'])!=false ? "" : addslashes($_REQUEST['payurl']); //鍐呭--鐭摼鎺ラ獙璇佺爜
@@ -144,10 +169,16 @@
$m1=empty($_REQUEST['m1'])!=false ? "" : addslashes($_REQUEST['m1']); //鍐呭--鏀跺埌瀹氶噾
$m2=empty($_REQUEST['m2'])!=false ? "" : addslashes($_REQUEST['m2']); //鍐呭--鏀堕綈浣欎笅閲戦
$d1=empty($_REQUEST['d1'])!=false ? "" : addslashes($_REQUEST['d1']); //鍐呭--鍑哄彂鍦�
- $codejson=json_encode(array("name"=>$name,"m1"=>$m1,"m2"=>$m2,"d1"=>$d1), JSON_UNESCAPED_UNICODE);
+ // $codejson=json_encode(array("name"=>$name,"m1"=>$m1,"m2"=>$m2,"d1"=>$d1), JSON_UNESCAPED_UNICODE);
+ $result=sendPayOK($Phone,$name,$m1,$d1,$m2);
+ echo json_encode($result);
+ return;
}elseif ($code!=''){
//鍙戦�侀獙璇佺爜
- $codejson=json_encode(array("code"=>$code), JSON_UNESCAPED_UNICODE);
+ // $codejson=json_encode(array("code"=>$code), JSON_UNESCAPED_UNICODE);
+ $result=sendValidate($Phone,$code);
+ echo json_encode($result);
+ return;
}
if ($Phone!='' and $codejson!='' and $lateCode!='') {
$response = SmsDemo::sendSms($Phone,$codejson,$lateCode,$SignName);
diff --git a/API/v3/OrderPrice.gds b/API/v3/OrderPrice.gds
index 8ceb106..8696145 100644
--- a/API/v3/OrderPrice.gds
+++ b/API/v3/OrderPrice.gds
@@ -158,7 +158,7 @@
If StartAddress_lat=0 And errcode=0 Then
appUrl="https://api.map.baidu.com/geocoding/v3/"
- args1="address="&StartAddress&"&output=json&ak=rGQBbHKGjAtVQy23OckafQkC6nNlaGmi"
+ args1="address="&StartAddress&"&output=json&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p"
HTMLCODE= GetBody(appUrl,args1)
'Response.Write HTMLCODE
'Response.End
@@ -186,7 +186,7 @@
End If
If EndAddress_lat=0 And errcode=0 Then
appUrl="https://api.map.baidu.com/geocoding/v3/"
- args1="address="&EndAddress&"&output=json&ak=rGQBbHKGjAtVQy23OckafQkC6nNlaGmi"
+ args1="address="&EndAddress&"&output=json&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p"
HTMLCODE= GetBody(appUrl,args1)
'Response.Write HTMLCODE
'Response.End
@@ -213,7 +213,7 @@
'鍦板尯鎶ヤ环鏂规
appUrl="https://api.map.baidu.com/reverse_geocoding/v3/"
- args1="location="&Region_lat&","&Region_lng&"&output=json&latest_admin=1&ak=rGQBbHKGjAtVQy23OckafQkC6nNlaGmi"
+ args1="coordtype=gcj02ll&location="&Region_lat&","&Region_lng&"&output=json&latest_admin=1&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p"
HTMLCODE= GetBody(appUrl,args1)
json = HTMLCODE
'Response.Write HTMLCODE
@@ -229,7 +229,7 @@
If TraDistance=0 Then
'璺嚎瑙勫垝璺濈(鍏噷)
appUrl="https://api.map.baidu.com/directionlite/v1/driving"
- args1="origin="&StartAddress_lat&","&StartAddress_lng&"&destination="&EndAddress_lat&","&EndAddress_lng&"&coord_type=wgs84&ak=rGQBbHKGjAtVQy23OckafQkC6nNlaGmi"
+ args1="origin="&StartAddress_lat&","&StartAddress_lng&"&destination="&EndAddress_lat&","&EndAddress_lng&"&coord_type=wgs84&ak=itVkbEKpECSqWgP9u8Po7ZiBkUHR9p2p"
HTMLCODE= GetBody(appUrl,args1)
json = HTMLCODE
@@ -390,7 +390,7 @@
OrderPriceFRM = OrderPriceFRM & "+"&WaitingInt&"*"&IRWaitingCost
OrderPriceTXT = OrderPriceTXT&"绛夊緟璐圭敤:"&WaitingInt*IRWaitingCost&"鍏僜n"
End If
- If ServiceOrdApptDate<>"" Then '闈炲伐浣滄椂闂存湇鍔¤垂鐢�20250812锛屽懆涓�~鍛ㄤ簲鏅氫笂21鐐�30鍒嗗悗鑷虫棭涓�7鐐规暣鍓嶄负1.3鍊�
+ If ServiceOrdApptDate<>"" Then '闈炲伐浣滄椂闂存湇鍔¤垂鐢�20250624锛屽懆涓�~鍛ㄤ簲鏅氫笂22鐐瑰悗鑷虫棭涓�7鐐规暣鍓嶄负1.3鍊�
sql="select SpecialRatio from SpecialDates where SpecialDates='"&formatdatetime(ServiceOrdApptDate,2)&"'"
rs.open sql,objConn,1,1
if not rs.Eof Then
@@ -398,7 +398,7 @@
OrderPriceFRM = OrderPriceFRM & OrderPrice*(SpecialRatio-1)
OrderPriceTXT = OrderPriceTXT&"鑺傚亣鏃ユ椂闂存湇鍔¤垂鐢�:"&OrderPrice*(SpecialRatio-1)&"鍏僜n"
OrderPrice=OrderPrice*SpecialRatio
- ElseIf (hour(ServiceOrdApptDate)>=21 And minute(ServiceOrdApptDate)>=30) Or hour(ServiceOrdApptDate)<7 Then
+ ElseIf (hour(ServiceOrdApptDate)>=22 Or hour(ServiceOrdApptDate)<7) Then
OrderPriceFRM = OrderPriceFRM & OrderPrice*0.3
OrderPriceTXT = OrderPriceTXT&"闈炲伐浣滄椂闂存湇鍔¤垂鐢�:"&OrderPrice*0.3&"鍏僜n"
OrderPrice=OrderPrice*1.3
--
Gitblit v1.9.1