Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of…

Merge branches 'develop' and 'feature/20200506_取餐时间调整_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

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

@@ -258,7 +258,7 @@ public class CheckOrder {
                 takeMealDateTime = new Date(takeAwayTime);
 //                createOrderVo.setTakeMealTime(DateUtil.convert2Str(takeMealDateTime, "HH:mm"));
             }
-            if (takeMealDateTime != null && (takeMealDateTime.before(deliveryStartDate) || takeMealDateTime.after(deliveryStartDate))) {
+            if (takeMealDateTime != null && (takeMealDateTime.before(deliveryStartDate) || takeMealDateTime.after(deliveryEndDate))) {
                 throw new ServiceException(ResponseResult.ORDER_CREATE_TIME_NOT_DELIVERY);
             }
             storeDeliveryInfoDto.setEnableTakeaway(true);
@@ -268,6 +268,8 @@ public class CheckOrder {
         //重新赋值为yyyy-MM-dd HH:mm:ss格式字符串时间
         if(takeMealDateTime != null){
             createOrderVo.setTakeMealTime(DateUtil.convert2String(takeMealDateTime, "yyyy-MM-dd HH:mm:ss"));
+        }else {
+            createOrderVo.setTakeMealTime(null);
         }
         //非到店或者外卖，类型错误
         if (!(CreateOrderType.COLLECT_GOODS.getCode().equals(createOrderVo.getOrderType()) ||