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
3a04bfb5
Commit
3a04bfb5
authored
Dec 14, 2020
by
张洪旺
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/qa' into qa
parents
bab92061
f98ef596
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 @
3a04bfb5
...
@@ -413,7 +413,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -413,7 +413,7 @@ public class OrderServiceImpl implements Orderservice {
dto
.
setPartnerId
(
partnerId
);
dto
.
setPartnerId
(
partnerId
);
dto
.
setStoreId
(
storeId
);
dto
.
setStoreId
(
storeId
);
dto
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
dto
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
paymentQueueService
.
paymentCallback
(
dto
);
//
paymentQueueService.paymentCallback(dto);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
info
(
"paymentQueueService.paymentCallback"
+
dto
+
" error"
+
e
);
log
.
info
(
"paymentQueueService.paymentCallback"
+
dto
+
" error"
+
e
);
}
}
...
@@ -435,7 +435,7 @@ public class OrderServiceImpl implements Orderservice {
...
@@ -435,7 +435,7 @@ public class OrderServiceImpl implements Orderservice {
dto
.
setStoreId
(
storeId
);
dto
.
setStoreId
(
storeId
);
dto
.
setPayChannelType
(
payChanelType
);
dto
.
setPayChannelType
(
payChanelType
);
dto
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
dto
.
setTrackingNo
(
LogThreadLocal
.
getTrackingNo
());
paymentQueueService
.
paymentCallback
(
dto
);
//
paymentQueueService.paymentCallback(dto);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
log
.
info
(
"paymentQueueService.paymentCallback"
+
dto
+
" error"
+
e
);
log
.
info
(
"paymentQueueService.paymentCallback"
+
dto
+
" error"
+
e
);
}
}
...
...
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