Merge branch 'feature/2020-1104-混合支付' into qa

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

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

@@ -178,6 +178,10 @@ public class OrderServiceImpl implements Orderservice {
     private String cloud_print_exchange;
     @Value("${mcCafe.fengniao.storeId}")
     private String fnStoreId;
+    @Value("${svcSwith}")
+    private Boolean svcSwitch;
+    @Value("${partnerId}")
+    private String partnerId;
 
     @Autowired
     private AssortmentCloudPrinterManager cloudPrinterManager;
@@ -2381,7 +2385,8 @@ public class OrderServiceImpl implements Orderservice {
         OrderPayResponse orderPayResponse = new OrderPayResponse();
         tigger = true;
         //混合支付
-        if (tigger && StringUtils.isNotBlank(channel)) {
+        //partnerId.contains()
+        if (svcSwitch && partnerId.contains(orderBean.getCompanyId()) && tigger && StringUtils.isNotBlank(channel)) {
             log.info("混合支付:");
             String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
             orderPayResponse = comPayOrder(cardCode,orderBean,paymentRequest,partnerPayOvertime,totalAmount.intValue(),channel,storeId,LogThreadLocal.getTrackingNo());