Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gdtel-gztel-school-center
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴学德
gdtel-gztel-school-center
Commits
eb9777c9
Commit
eb9777c9
authored
Mar 04, 2021
by
罗承锋
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付跳转前端地址采用url携参
parent
b28949dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
apply-net/src/main/java/com/winsun/controller/DankuanController.java
+3
-2
apply-net/src/main/java/com/winsun/controller/RongHeController.java
+4
-3
No files found.
apply-net/src/main/java/com/winsun/controller/DankuanController.java
View file @
eb9777c9
...
@@ -465,7 +465,7 @@ public class DankuanController {
...
@@ -465,7 +465,7 @@ public class DankuanController {
}
finally
{
}
finally
{
redisLockUtil
.
deleteLock
(
orderSeq
);
redisLockUtil
.
deleteLock
(
orderSeq
);
}
}
return
ResponseData
.
error
(
"
订单异常
"
);
return
ResponseData
.
error
(
"
支付失败!若已支付请实名认证,未支付请稍后尝试支付。
"
);
}
}
/**
/**
...
@@ -508,7 +508,8 @@ public class DankuanController {
...
@@ -508,7 +508,8 @@ public class DankuanController {
/**
/**
* 测试后提交代码要恢复正式环境地址
* 测试后提交代码要恢复正式环境地址
*/
*/
String
MERCHANTURL
=
"https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId="
+
orderSeq
;
// String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
String
MERCHANTURL
=
"https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage/"
+
orderSeq
;
map
.
put
(
"MERCHANTURL"
,
MERCHANTURL
);
map
.
put
(
"MERCHANTURL"
,
MERCHANTURL
);
//单宽回调后端接口地址
//单宽回调后端接口地址
// 正式环境
// 正式环境
...
...
apply-net/src/main/java/com/winsun/controller/RongHeController.java
View file @
eb9777c9
...
@@ -434,11 +434,11 @@ public class RongHeController {
...
@@ -434,11 +434,11 @@ public class RongHeController {
String
result
=
JsoupMethodZhifu
(
orderSeq
,
ipay
,
userId
,
request
,
response
,
rhTime
);
String
result
=
JsoupMethodZhifu
(
orderSeq
,
ipay
,
userId
,
request
,
response
,
rhTime
);
return
ResponseData
.
success
(
result
);
return
ResponseData
.
success
(
result
);
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
e
.
getMessag
e
();
e
.
printStackTrac
e
();
}
finally
{
}
finally
{
redisLockUtil
.
deleteLock
(
orderSeq
);
redisLockUtil
.
deleteLock
(
orderSeq
);
}
}
return
ResponseData
.
error
(
"
订单异常
"
);
return
ResponseData
.
error
(
"
支付失败!若已支付请实名认证,未支付请稍后尝试支付。
"
);
}
}
@RequestMapping
(
"/selectUniversity"
)
@RequestMapping
(
"/selectUniversity"
)
public
ResponseData
<
UniversityInfo
>
selectUniversity
(
@RequestParam
(
"universityId"
)
String
universityId
)
{
public
ResponseData
<
UniversityInfo
>
selectUniversity
(
@RequestParam
(
"universityId"
)
String
universityId
)
{
...
@@ -487,7 +487,8 @@ public class RongHeController {
...
@@ -487,7 +487,8 @@ public class RongHeController {
/**
/**
* 测试后提交代码要恢复正式环境地址
* 测试后提交代码要恢复正式环境地址
*/
*/
String
MERCHANTURL
=
"https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId="
+
orderSeq
;
// String MERCHANTURL = "https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
String
MERCHANTURL
=
"https://dx.dianyuanjiangli.com/mobile/#/hhr/kdyToSuccessPage/"
+
orderSeq
;
// 测试
// 测试
// String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
// String MERCHANTURL = "http://3715zj2369.qicp.vip:52511/#/hhr/kdyToSuccessPage?kdId=" + orderSeq;
map
.
put
(
"MERCHANTURL"
,
MERCHANTURL
);
map
.
put
(
"MERCHANTURL"
,
MERCHANTURL
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment