Skip to content

O
order-group
Commit 599c9f7d by 张洪旺
Options

fix coco商户配置

parent 8acab872
Showing with 2 additions and 2 deletions
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -275,7 +275,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -275,7 +275,7 @@ public class OrderServiceImpl implements Orderservice {
private EcologyAdminApplicationClient ecologyAdminApplicationClient; private EcologyAdminApplicationClient ecologyAdminApplicationClient;
@Value("${coco.partnerId}") @Value("${coco.partnerId}")
private String partnerId; private String cocoPartnerId;
@Override @Override
public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) { public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
...@@ -1601,7 +1601,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1601,7 +1601,7 @@ public class OrderServiceImpl implements Orderservice {
} }
// todo coco 商户校验 // todo coco 商户校验
if (partnerId.equals(orderByIdResponseDto.getData().getCompanyId())) { if (cocoPartnerId.equals(orderByIdResponseDto.getData().getCompanyId())) {
// COCO 即时单不可取消 // COCO 即时单不可取消
if ( NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(queryOrderByIdResponse.getData().getNewOrderType())) { if ( NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(queryOrderByIdResponse.getData().getNewOrderType())) {
return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR); return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment