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
82b85bdc
Commit
82b85bdc
authored
Dec 21, 2020
by
xiaoer.li@freemud.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/qa' into qa
parents
be8da407
eda31e90
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
2 deletions
+1
-2
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
+1
-0
call-back-service/src/main/java/cn/freemud/controller/CallBackController.java
+0
-2
No files found.
call-back-service/src/main/java/cn/freemud/amp/service/OrderCallBackMQService.java
View file @
82b85bdc
...
@@ -113,6 +113,7 @@ public class OrderCallBackMQService {
...
@@ -113,6 +113,7 @@ public class OrderCallBackMQService {
//2:未支付
//2:未支付
requestDto
.
setOrderStatus
(
2
);
requestDto
.
setOrderStatus
(
2
);
try
{
try
{
log
.
info
(
"common on revert body try requestDto:"
+
requestDto
);
Header
header
=
new
Header
(
MQAction
.
INSERT
.
getAction
(),
"backOrdersStatusChange"
,
orderCode
,
backOrdersChangeOrderStatusConsumerQueue
);
Header
header
=
new
Header
(
MQAction
.
INSERT
.
getAction
(),
"backOrdersStatusChange"
,
orderCode
,
backOrdersChangeOrderStatusConsumerQueue
);
MQMessage
<
OrderStatusChangeRequestDto
>
message
=
new
MQMessage
<>(
header
,
requestDto
);
MQMessage
<
OrderStatusChangeRequestDto
>
message
=
new
MQMessage
<>(
header
,
requestDto
);
mqService
.
convertAndSend
(
backOrdersNotifyActivityExchange
,
backOrdersChangeOrderStatusConsumerQueue
,
message
);
mqService
.
convertAndSend
(
backOrdersNotifyActivityExchange
,
backOrdersChangeOrderStatusConsumerQueue
,
message
);
...
...
call-back-service/src/main/java/cn/freemud/controller/CallBackController.java
View file @
82b85bdc
...
@@ -38,8 +38,6 @@ public class CallBackController {
...
@@ -38,8 +38,6 @@ public class CallBackController {
@PostMapping
(
"/order"
)
@PostMapping
(
"/order"
)
@ApiAnnotation
(
logMessage
=
"/order"
)
@ApiAnnotation
(
logMessage
=
"/order"
)
public
BaseResponse
orderCallBackHandle
(
@Valid
@RequestBody
@LogParams
OrderCallBackRequestVo
requestVo
)
{
public
BaseResponse
orderCallBackHandle
(
@Valid
@RequestBody
@LogParams
OrderCallBackRequestVo
requestVo
)
{
log
.
info
(
"in callback order ordercode:"
+
requestVo
.
getOrderCode
());
log
.
info
(
"callback order requestVo:"
+
requestVo
);
return
orderCallBackService
.
orderCallBackHandle
(
requestVo
);
return
orderCallBackService
.
orderCallBackHandle
(
requestVo
);
}
}
...
...
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