Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into…

Merge remote-tracking branch 'origin/feature/20200727_麦咖啡p1v2支付券码路由' into feature/20200727_麦咖啡p1v2支付券码路由

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

@@ -140,7 +140,7 @@ public class DeliveryAdapter {
 
         //---麦咖啡餐道专用---
         deliveryOrderRequestDto.setDisplayOrderId(displayOrderId);
-        deliveryOrderRequestDto.setTaxFlag(0);
+        deliveryOrderRequestDto.setTaxFlag(1);
         if (CollectionUtils.isNotEmpty(order.getAccountList())) {
             List<QueryOrdersResponseDto.DataBean.OrderBean.AccountBean> collect = order.getAccountList().stream().filter(type -> type != null && !type.equals(1)).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {