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
42285970
Commit
42285970
authored
Dec 21, 2020
by
zhiheng.zhang
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20201203-抖音小程序渠道新增-张志恒' into develop
parents
7cb7f6df
de7d4982
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
+1
-1
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
+1
-1
No files found.
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
View file @
42285970
...
...
@@ -2864,7 +2864,7 @@ public class OrderAdapter {
}
createOrderResponseVo
.
setOrderStr
(
payOrderBean
==
null
?
""
:
payOrderBean
.
getAliPayOrder
());
//抖音支付添加返回OrderInfo
if
(
PayChannelType
.
TIKTOKPAY
.
getIndex
(
).
equals
(
orderBean
.
getPayChannelType
()))
{
if
(
String
.
valueOf
(
PayChannelType
.
TIKTOKPAY
.
getIndex
()
).
equals
(
orderBean
.
getPayChannelType
()))
{
OrderInfo
orderInfo
=
new
OrderInfo
();
orderInfo
.
setOrder_id
(
orderPayResponse
.
getThirdOrderId
());
orderInfo
.
setOrder_token
(
orderPayResponse
.
getThirdOrderToken
());
...
...
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