记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
896a4de4
Commit
896a4de4
authored
May 20, 2022
by
胡佳晨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改 下单接口 支持 新小程序支付
parent
f36a2319
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
GoblinNftOrderServiceImpl.java
...service/order/service/impl/GoblinNftOrderServiceImpl.java
+1
-1
GoblinOrderServiceImpl.java
...et/service/order/service/impl/GoblinOrderServiceImpl.java
+2
-2
KylinOrderTicketsServiceImpl.java
...vice/order/service/impl/KylinOrderTicketsServiceImpl.java
+2
-2
No files found.
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinNftOrderServiceImpl.java
View file @
896a4de4
...
@@ -414,7 +414,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
...
@@ -414,7 +414,7 @@ public class GoblinNftOrderServiceImpl implements IGoblinNftOrderService {
httpData
.
add
(
"expireTime"
,
"5"
);
httpData
.
add
(
"expireTime"
,
"5"
);
httpData
.
add
(
"payType"
,
nftOrder
.
getPayType
());
httpData
.
add
(
"payType"
,
nftOrder
.
getPayType
());
httpData
.
add
(
"deviceFrom"
,
nftOrder
.
getDeviceFrom
());
httpData
.
add
(
"deviceFrom"
,
nftOrder
.
getDeviceFrom
());
if
(
nftOrder
.
getDeviceFrom
().
equals
(
"js"
)
||
nftOrder
.
getDeviceFrom
().
equals
(
"applet"
))
{
if
(
nftOrder
.
getDeviceFrom
().
equals
(
"js"
)
||
nftOrder
.
getDeviceFrom
().
equals
(
"applet"
)
||
nftOrder
.
getDeviceFrom
().
equals
(
"appletb"
)
)
{
httpData
.
add
(
"openId"
,
payParam
.
getOpenId
());
httpData
.
add
(
"openId"
,
payParam
.
getOpenId
());
}
}
httpData
.
add
(
"showUrl"
,
showUrl
);
httpData
.
add
(
"showUrl"
,
showUrl
);
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java
View file @
896a4de4
...
@@ -434,7 +434,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
...
@@ -434,7 +434,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
if
(
preParam
.
getDeviceFrom
().
equals
(
"micropay"
))
{
if
(
preParam
.
getDeviceFrom
().
equals
(
"micropay"
))
{
httpData
.
add
(
"authCode"
,
preParam
.
getAuthCode
());
httpData
.
add
(
"authCode"
,
preParam
.
getAuthCode
());
}
}
if
(
preParam
.
getDeviceFrom
().
equals
(
"js"
)
||
preParam
.
getDeviceFrom
().
equals
(
"applet"
))
{
if
(
preParam
.
getDeviceFrom
().
equals
(
"js"
)
||
preParam
.
getDeviceFrom
().
equals
(
"applet"
)
||
preParam
.
getDeviceFrom
().
equals
(
"appletb"
)
)
{
httpData
.
add
(
"openId"
,
preParam
.
getOpenId
());
httpData
.
add
(
"openId"
,
preParam
.
getOpenId
());
}
}
// if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
// if (preParam.getPayType().equals("alipay") && preParam.getDeviceFrom().equals("wap")) {
...
@@ -698,7 +698,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
...
@@ -698,7 +698,7 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
httpData
.
add
(
"payType"
,
param
.
getPayType
());
httpData
.
add
(
"payType"
,
param
.
getPayType
());
httpData
.
add
(
"deviceFrom"
,
param
.
getDeviceFrom
());
httpData
.
add
(
"deviceFrom"
,
param
.
getDeviceFrom
());
if
(
param
.
getDeviceFrom
().
equals
(
"js"
)
||
param
.
getDeviceFrom
().
equals
(
"applet"
))
{
if
(
param
.
getDeviceFrom
().
equals
(
"js"
)
||
param
.
getDeviceFrom
().
equals
(
"applet"
)
||
param
.
getDeviceFrom
().
equals
(
"appletb"
)
)
{
httpData
.
add
(
"openId"
,
param
.
getOpenId
());
httpData
.
add
(
"openId"
,
param
.
getOpenId
());
}
}
// if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) {
// if (param.getPayType().equals("alipay") && param.getDeviceFrom().equals("wap")) {
...
...
liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java
View file @
896a4de4
...
@@ -637,7 +637,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -637,7 +637,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData
.
add
(
"expireTime"
,
(
orderTickets
.
getPayCountdownMinute
())
+
""
);
httpData
.
add
(
"expireTime"
,
(
orderTickets
.
getPayCountdownMinute
())
+
""
);
httpData
.
add
(
"payType"
,
payOrderParam
.
getPayType
());
httpData
.
add
(
"payType"
,
payOrderParam
.
getPayType
());
httpData
.
add
(
"deviceFrom"
,
payOrderParam
.
getDeviceFrom
());
httpData
.
add
(
"deviceFrom"
,
payOrderParam
.
getDeviceFrom
());
if
(
payOrderParam
.
getDeviceFrom
().
equals
(
"js"
)
||
payOrderParam
.
getDeviceFrom
().
equals
(
"applet"
))
{
if
(
payOrderParam
.
getDeviceFrom
().
equals
(
"js"
)
||
payOrderParam
.
getDeviceFrom
().
equals
(
"applet"
)
||
payOrderParam
.
getDeviceFrom
().
equals
(
"appletb"
)
)
{
httpData
.
add
(
"openId"
,
payOrderParam
.
getOpenId
());
httpData
.
add
(
"openId"
,
payOrderParam
.
getOpenId
());
}
}
if
(
payOrderParam
.
getPayType
().
equals
(
"alipay"
)
&&
payOrderParam
.
getDeviceFrom
().
equals
(
"wap"
))
{
if
(
payOrderParam
.
getPayType
().
equals
(
"alipay"
)
&&
payOrderParam
.
getDeviceFrom
().
equals
(
"wap"
))
{
...
@@ -766,7 +766,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
...
@@ -766,7 +766,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
httpData
.
add
(
"payType"
,
payAgainParam
.
getPayType
());
httpData
.
add
(
"payType"
,
payAgainParam
.
getPayType
());
httpData
.
add
(
"deviceFrom"
,
payAgainParam
.
getDeviceFrom
());
httpData
.
add
(
"deviceFrom"
,
payAgainParam
.
getDeviceFrom
());
if
(
payAgainParam
.
getDeviceFrom
().
equals
(
"js"
)
||
payAgainParam
.
getDeviceFrom
().
equals
(
"applet"
))
{
if
(
payAgainParam
.
getDeviceFrom
().
equals
(
"js"
)
||
payAgainParam
.
getDeviceFrom
().
equals
(
"applet"
)
||
payAgainParam
.
getDeviceFrom
().
equals
(
"appletb"
)
)
{
httpData
.
add
(
"openId"
,
payAgainParam
.
getOpenId
());
httpData
.
add
(
"openId"
,
payAgainParam
.
getOpenId
());
}
}
...
...
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