Merge branch 'feature/20201013_麦咖啡p4v1问题修复_xukangg' into qa

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1136,8 +1136,10 @@ public class OrderAdapter {
             responseVo.setPayStatusDesc(Optional.ofNullable(PayStatus.getByCode(ordersBean.getPayStatus()))
                     .map(PayStatus::getDesc).orElse(""));
             responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
+            if(mcCafePartnerId.equals(ordersBean.getCompanyId())) {
                 responseVo.setPayVoucherBarCode(Base64.getEncoder().encodeToString(
                         BarcodeUtil.generateBarCode128(responseVo.getPayVoucher(),null,null, true, true)));
+            }
             responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
             responseVo.setPayChannel(ordersBean.getPayChannel());
             if (StringUtils.isNotBlank(ordersBean.getPayChannel())) {