Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
order-group
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
order-group-application
order-group
Commits
4ce278e3
Commit
4ce278e3
authored
Nov 19, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:标识符
parent
a1180f48
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+4
-4
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
4ce278e3
...
@@ -2274,10 +2274,10 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2274,10 +2274,10 @@ public class OrderServiceImpl implements Orderservice {
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
cardCode
)
&&
Objects
.
isNull
(
createPrepayRequestDto
.
getUnionPayCard
()))
{
if
(
totalAmount
>
0
&&
StringUtils
.
isBlank
(
cardCode
)
&&
Objects
.
isNull
(
createPrepayRequestDto
.
getUnionPayCard
()))
{
createOrderResponse
.
setPaySuccess
(
false
);
createOrderResponse
.
setPaySuccess
(
false
);
}
}
else
if
(
StringUtils
.
isNotBlank
(
orderPayResponse
.
getPayMode
())
&&
PayChannelType
.
COMB
.
get
Index
().
equals
(
orderPayResponse
.
getPayMode
())){
else
if
(
StringUtils
.
isNotBlank
(
orderPayResponse
.
getPayMode
())
&&
PayChannelType
.
COMB
.
get
Ebcode
().
equals
(
orderPayResponse
.
getPayMode
())){
createOrderResponse
.
setPaySuccess
(
false
);
createOrderResponse
.
setPaySuccess
(
false
);
}
}
else
if
(
StringUtils
.
isNotBlank
(
orderPayResponse
.
getPayMode
())
&&
PayChannelType
.
SVC
.
get
Index
().
equals
(
orderPayResponse
.
getPayMode
())){
else
if
(
StringUtils
.
isNotBlank
(
orderPayResponse
.
getPayMode
())
&&
PayChannelType
.
SVC
.
get
Ebcode
().
equals
(
orderPayResponse
.
getPayMode
())){
createOrderResponse
.
setPaySuccess
(
true
);
createOrderResponse
.
setPaySuccess
(
true
);
}
}
else
{
else
{
...
@@ -2530,7 +2530,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -2530,7 +2530,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse
.
setOpenId
(
paymentRequest
.
getOpenId
());
orderPayResponse
.
setOpenId
(
paymentRequest
.
getOpenId
());
orderPayResponse
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayResponse
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayResponse
.
setOrderId
(
orderBean
.
getOid
());
orderPayResponse
.
setOrderId
(
orderBean
.
getOid
());
orderPayResponse
.
setPayMode
(
PayChannelType
.
SVC
.
get
Index
()+
""
);
orderPayResponse
.
setPayMode
(
PayChannelType
.
SVC
.
get
Ebcode
()
);
}
}
return
orderPayResponse
;
return
orderPayResponse
;
}
}
...
@@ -3227,7 +3227,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3227,7 +3227,7 @@ public class OrderServiceImpl implements Orderservice {
orderPayResponse
.
setWxAppid
(
paymentRequest
.
getWxAppId
());
orderPayResponse
.
setWxAppid
(
paymentRequest
.
getWxAppId
());
orderPayResponse
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayResponse
.
setPartnerId
(
orderBean
.
getCompanyId
());
orderPayResponse
.
setOrderId
(
orderBean
.
getOid
());
orderPayResponse
.
setOrderId
(
orderBean
.
getOid
());
orderPayResponse
.
setPayMode
(
PayChannelType
.
COMB
.
get
Index
()+
""
);
orderPayResponse
.
setPayMode
(
PayChannelType
.
COMB
.
get
Ebcode
()
);
//隐射关系
//隐射关系
redisCache
.
save
(
RedisUtil
.
getPaymentTransIdOrderKey
(
payPlatform
.
getTransId
()),
orderBean
.
getOid
(),
1L
,
TimeUnit
.
DAYS
);
redisCache
.
save
(
RedisUtil
.
getPaymentTransIdOrderKey
(
payPlatform
.
getTransId
()),
orderBean
.
getOid
(),
1L
,
TimeUnit
.
DAYS
);
//加入轮训队列
//加入轮训队列
...
...
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