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
283d7110
Commit
283d7110
authored
Jul 31, 2021
by
李学兴
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/20210731-增加commons-pool2-lxx' into qa
parents
8c9d8073
c740dabb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletions
+5
-1
order-management/src/main/java/cn/freemud/management/service/impl/WaimaiOrderMangerServiceImpl.java
+1
-1
pom.xml
+4
-0
No files found.
order-management/src/main/java/cn/freemud/management/service/impl/WaimaiOrderMangerServiceImpl.java
View file @
283d7110
...
@@ -49,7 +49,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
...
@@ -49,7 +49,7 @@ public class WaimaiOrderMangerServiceImpl implements OrderManagerService {
PlatformOrderRequest
platformOrderRequest
=
waimaiSdkAdapter
.
getPlatformOrderRequest
(
request
,
orderBean
);
PlatformOrderRequest
platformOrderRequest
=
waimaiSdkAdapter
.
getPlatformOrderRequest
(
request
,
orderBean
);
com
.
freemud
.
application
.
sdk
.
api
.
base
.
BaseResponse
waimaiBaseResponse
=
waimaiOrderService
.
confirm
(
platformOrderRequest
,
LogThreadLocal
.
getTrackingNo
());
com
.
freemud
.
application
.
sdk
.
api
.
base
.
BaseResponse
waimaiBaseResponse
=
waimaiOrderService
.
confirm
(
platformOrderRequest
,
LogThreadLocal
.
getTrackingNo
());
if
(
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
waimaiBaseResponse
.
getCode
()))
{
if
(
ObjectUtils
.
notEqual
(
ResponseResult
.
SUCCESS
.
getCode
(),
waimaiBaseResponse
.
getCode
()))
{
ErrorLog
.
errorConvertJson
(
this
.
getClass
(),
ResponseResult
.
ORDER_ACCEPT_FAILED
.
getMessage
()
+
" ordercode: "
+
request
.
getOrderId
(),
null
);
//
ErrorLog.errorConvertJson(this.getClass(),ResponseResult.ORDER_ACCEPT_FAILED.getMessage() + " ordercode: "+ request.getOrderId(),null);
throw
new
OrderServiceException
(
ResponseResult
.
ORDER_ACCEPT_FAILED
);
throw
new
OrderServiceException
(
ResponseResult
.
ORDER_ACCEPT_FAILED
);
}
}
return
ResponseUtil
.
success
();
return
ResponseUtil
.
success
();
...
...
pom.xml
View file @
283d7110
...
@@ -176,6 +176,10 @@
...
@@ -176,6 +176,10 @@
<groupId>
com.freemud.application.service.sdk
</groupId>
<groupId>
com.freemud.application.service.sdk
</groupId>
<artifactId>
sdk-common-base
</artifactId>
<artifactId>
sdk-common-base
</artifactId>
</dependency>
</dependency>
<dependency>
<groupId>
org.apache.commons
</groupId>
<artifactId>
commons-pool2
</artifactId>
</dependency>
</dependencies>
</dependencies>
<distributionManagement>
<distributionManagement>
<repository>
<repository>
...
...
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