Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into qa

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

@@ -164,7 +164,7 @@ public class DeliveryAdapter {
         }else {
             deliveryOrderRequestDto.setIsImmediateDelivery(1);
             String expectDeliveryTimeByUTC = order.getGmtCreate() !=null ?
-                    simpleDateFormat.format(DateUtil.addHours(DateUtil.addMinutes(new Date(order.getGmtCreate()),30), -8)) :null;
+                    simpleDateFormat.format(DateUtil.addHours(DateUtil.addMinutes(new Date(order.getGmtCreate()),storeInfo.getBizVO().getServiceTime()), -8)) :null;
             deliveryOrderRequestDto.setExpectDeliveryTimeByUTC(expectDeliveryTimeByUTC);
         }
         //---麦咖啡餐道专用---