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
8d0bda83
Commit
8d0bda83
authored
Dec 08, 2020
by
张洪旺
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix coco商户配置
parent
599c9f7d
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
+6
-3
No files found.
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
View file @
8d0bda83
...
...
@@ -274,8 +274,11 @@ public class OrderServiceImpl implements Orderservice {
@Autowired
private
EcologyAdminApplicationClient
ecologyAdminApplicationClient
;
@Value
(
"${coco.partnerId}"
)
private
String
cocoPartnerId
;
/**
* coco商户
*/
@Value
(
"#{'${coco.partnerId}'.split(',')}"
)
private
List
<
String
>
cocoPartnerId
;
@Override
public
BaseResponse
checkBeforeCreateOrder
(
CheckBeforeCreateOrderRequestVo
requestVo
)
{
...
...
@@ -1601,7 +1604,7 @@ public class OrderServiceImpl implements Orderservice {
}
// todo coco 商户校验
if
(
cocoPartnerId
.
equal
s
(
orderByIdResponseDto
.
getData
().
getCompanyId
()))
{
if
(
cocoPartnerId
.
contain
s
(
orderByIdResponseDto
.
getData
().
getCompanyId
()))
{
// COCO 即时单不可取消
if
(
NewOrderType
.
GENERAL_SELF_PICKUP
.
getCode
().
equals
(
queryOrderByIdResponse
.
getData
().
getNewOrderType
()))
{
return
ResponseUtil
.
error
(
ResponseResult
.
ORDER_CANCEL_ERROR
);
...
...
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