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
326d2b9e
Commit
326d2b9e
authored
Aug 28, 2020
by
张洪旺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix 循环依赖
parent
ebe3c014
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
4 deletions
+9
-4
order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
+9
-4
No files found.
order-application-service/src/main/java/cn/freemud/fuyou/service/FuYouOrderService.java
View file @
326d2b9e
...
...
@@ -55,7 +55,6 @@ import static cn.freemud.enums.ResponseResult.*;
@Slf4j
public
class
FuYouOrderService
{
private
final
CashEventProcessor
cashEventProcessor
;
private
final
OrderSdkService
orderSdkService
;
private
final
MapperFacade
mapperFacade
;
private
final
CouponFeignClient
couponFeignClient
;
...
...
@@ -63,11 +62,10 @@ public class FuYouOrderService {
private
final
OfflineCouponSdkService
offlineCouponSdkService
;
private
final
ScoreFeignClient
scoreFeignClient
;
public
FuYouOrderService
(
CashEventProcessor
cashEventProcessor
,
OrderSdkService
orderSdkService
,
MapperFacade
mapperFacade
,
public
FuYouOrderService
(
OrderSdkService
orderSdkService
,
MapperFacade
mapperFacade
,
CouponFeignClient
couponFeignClient
,
PaymentNewService
paymentNewService
,
OfflineCouponSdkService
offlineCouponSdkService
,
ScoreFeignClient
scoreFeignClient
)
{
this
.
cashEventProcessor
=
cashEventProcessor
;
this
.
orderSdkService
=
orderSdkService
;
this
.
mapperFacade
=
mapperFacade
;
this
.
couponFeignClient
=
couponFeignClient
;
...
...
@@ -214,6 +212,13 @@ public class FuYouOrderService {
return
payorderSeetlment
;
}
private
OrderInfoReqs
getOrderByThirdOrderCode
(
String
thirdOrderCode
,
String
orderClient
)
{
QueryByCodeResponse
orderInfo
=
orderSdkService
.
getOrderInfo
(
orderClient
,
null
,
thirdOrderCode
,
null
,
LogThreadLocal
.
getTrackingNo
());
if
(
ObjectUtils
.
notEqual
(
ResponseConstant
.
SUCCESS_RESPONSE_CODE
,
orderInfo
.
getCode
()))
{
throw
new
RuntimeException
(
orderInfo
.
getMessage
());
}
return
orderInfo
.
getResult
();
}
/***
* 支付完成
...
...
@@ -221,7 +226,7 @@ public class FuYouOrderService {
* @return
*/
public
BaseResponse
complete
(
CompleteRequest
request
)
{
OrderInfoReqs
orderInfoReqs
=
cashEventProcessor
.
getOrderByThirdOrderCode
(
request
.
getThirdOrderCode
(),
request
.
getOrderClient
());
OrderInfoReqs
orderInfoReqs
=
getOrderByThirdOrderCode
(
request
.
getThirdOrderCode
(),
request
.
getOrderClient
());
BaseResponse
response
=
new
BaseResponse
();
if
(
ObjectUtils
.
notEqual
(
PayStatus
.
HAVE_PAID
.
getCode
(),
orderInfoReqs
.
getPayState
())){
return
ResponseUtil
.
error
(
ORDER_NO_PAU
);
...
...
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