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
b50bc507
Commit
b50bc507
authored
Dec 01, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化:相关提示
parent
272e4d50
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+2
-2
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
b50bc507
...
@@ -3209,7 +3209,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3209,7 +3209,7 @@ public class OrderServiceImpl implements Orderservice {
String
ebCode
=
this
.
getPayCodeByChanel
(
paymentRequest
.
getWxAppId
(),
channel
,
storeId
);
String
ebCode
=
this
.
getPayCodeByChanel
(
paymentRequest
.
getWxAppId
(),
channel
,
storeId
);
OrderPayResponse
orderPayResponse
=
new
OrderPayResponse
();;
OrderPayResponse
orderPayResponse
=
new
OrderPayResponse
();;
if
(
StringUtils
.
isBlank
(
ebCode
))
{
if
(
StringUtils
.
isBlank
(
ebCode
))
{
orderPayResponse
.
setMsg
(
"
渠道码没有配置
"
);
orderPayResponse
.
setMsg
(
"
请先联系相关人员配置商户对应的支付渠道
"
);
return
orderPayResponse
;
return
orderPayResponse
;
}
}
...
@@ -3246,7 +3246,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -3246,7 +3246,7 @@ public class OrderServiceImpl implements Orderservice {
.
orElse
(
null
);
.
orElse
(
null
);
//现金+svc 现金
//现金+svc 现金
if
(
payPlatforms
.
size
()==
2
||
payPlatforms
.
size
()==
1
&&
cashPay
!=
null
)
{
if
(
payPlatforms
.
size
()==
2
||
(
payPlatforms
.
size
()==
1
&&
cashPay
!=
null
)
)
{
orderPayResponse
=
orderAdapter
.
convent2OrderCombPayResponse
(
combPayResponse
.
getData
().
getPayPlatformResponseList
(),
orderBean
.
getCompanyId
(),
storeId
);
orderPayResponse
=
orderAdapter
.
convent2OrderCombPayResponse
(
combPayResponse
.
getData
().
getPayPlatformResponseList
(),
orderBean
.
getCompanyId
(),
storeId
);
orderPayResponse
.
setOpenId
(
paymentRequest
.
getOpenId
());
orderPayResponse
.
setOpenId
(
paymentRequest
.
getOpenId
());
orderPayResponse
.
setWxAppid
(
paymentRequest
.
getWxAppId
());
orderPayResponse
.
setWxAppid
(
paymentRequest
.
getWxAppId
());
...
...
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