Commit 8d0bda83 by 张洪旺

fix coco商户配置

parent 599c9f7d
...@@ -274,8 +274,11 @@ public class OrderServiceImpl implements Orderservice { ...@@ -274,8 +274,11 @@ public class OrderServiceImpl implements Orderservice {
@Autowired @Autowired
private EcologyAdminApplicationClient ecologyAdminApplicationClient; private EcologyAdminApplicationClient ecologyAdminApplicationClient;
@Value("${coco.partnerId}") /**
private String cocoPartnerId; * coco商户
*/
@Value("#{'${coco.partnerId}'.split(',')}")
private List<String> cocoPartnerId;
@Override @Override
public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) { public BaseResponse checkBeforeCreateOrder(CheckBeforeCreateOrderRequestVo requestVo) {
...@@ -1601,7 +1604,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1601,7 +1604,7 @@ public class OrderServiceImpl implements Orderservice {
} }
// todo coco 商户校验 // todo coco 商户校验
if (cocoPartnerId.equals(orderByIdResponseDto.getData().getCompanyId())) { if (cocoPartnerId.contains(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