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
e34b4f8c
Commit
e34b4f8c
authored
Jul 07, 2022
by
周晓航
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'KA-技术优化-支付成功回调处理订单已取消的场景' into qa
parents
52bc5641
594cb202
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
+7
-2
No files found.
order-application-service/src/main/java/cn/freemud/controller/OrderController.java
View file @
e34b4f8c
...
...
@@ -21,8 +21,8 @@ import cn.freemud.entities.vo.*;
import
cn.freemud.entities.vo.encircle.CreateReserveOrderVo
;
import
cn.freemud.entities.vo.encircle.EncircleReserveBaseVo
;
import
cn.freemud.entities.vo.order.*
;
import
cn.freemud.handler.CouponOrderAutoRefundHandler
;
import
cn.freemud.handler.OrderReportJobHandler
;
import
cn.freemud.management.entities.dto.request.order.RefundSuccessCallbackVo
;
import
cn.freemud.service.EncircleOrderService
;
import
cn.freemud.service.Orderservice
;
import
cn.freemud.service.PointsMallOrderService
;
...
...
@@ -30,7 +30,6 @@ import cn.freemud.service.impl.MallOrderServiceImpl;
import
cn.freemud.service.impl.OrderAdapterServiceImpl
;
import
cn.freemud.utils.AppLogUtil
;
import
cn.freemud.utils.ResponseUtil
;
import
cn.freemud.handler.CouponOrderAutoRefundHandler
;
import
cn.freemud.xxljob.OrderCountJobHandler
;
import
com.freemud.application.sdk.api.log.ApiAnnotation
;
import
com.freemud.application.sdk.api.log.LogParams
;
...
...
@@ -141,6 +140,12 @@ public class OrderController {
@ApiAnnotation
(
logMessage
=
"newPaySuccessCallback"
)
@PostMapping
({
"/newPaySuccessCallback"
,
"/openStoreQueryPaymentCallback"
})
public
String
newPaySuccessCallback
(
@LogParams
@RequestBody
NewPaysuccessNoticeMessage
message
)
{
try
{
// 方便测试 技术优化需求,后续需要删除
Thread
.
sleep
(
3000
);
}
catch
(
Exception
e
){
}
return
orderservice
.
newPaySuccessCallback
(
message
);
}
...
...
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