Merge branch '20201125-coco-zhw' of gitlab.freemud.com:order-group-application/order-group into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -303,7 +303,7 @@ public class OrderServiceImpl implements Orderservice {
     @Autowired
     private SvcComPayClient svcComPayClient;
     @Value("${coco.partnerId}")
-    private String partnerId;
+    private String cocoPartnerId;
 
     @Autowired
     private OrderRelationFactory orderRelationFactory;
@@ -1801,7 +1801,7 @@ public class OrderServiceImpl implements Orderservice {
         }
 
         // todo coco 商户校验
-        if (partnerId.equals(orderByIdResponseDto.getData().getCompanyId())) {
+        if (cocoPartnerId.equals(orderByIdResponseDto.getData().getCompanyId())) {
             // COCO 即时单不可取消
             if ( NewOrderType.GENERAL_SELF_PICKUP.getCode().equals(queryOrderByIdResponse.getData().getNewOrderType())) {
                 return ResponseUtil.error(ResponseResult.ORDER_CANCEL_ERROR);