Merge branch 'KA-2.0.41-爱马哥预订单开发-zxh' into qa

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

@@ -325,19 +325,21 @@ public class CheckOrder {
             Date takeMealDateTime = getOrderExpectTime(takeMealFlag, takeMealTimes, createOrderVo.getExpectTime(),
                     CreateOrderType.getByCode(createOrderVo.getOrderType()), storeResponseDto.getServiceTime(), storeResponseDto);
             AppLogUtil.infoLog("fisherman 校验门店时间数据 00", JSON.toJSONString(takeMealDateTime),takeMealTimes);
-            if (takeMealDateTime != null) {
+            if (takeMealDateTime != null && !isAdvanceOrder) {
                 //校验预约时间 -->
-                if (!isAdvanceOrder) {
-                    checkOrderExpectTime(createOrderVo, storeResponseDto, takeMealDateTime);
-                }else {
+                checkOrderExpectTime(createOrderVo, storeResponseDto, takeMealDateTime);
+                //重新赋值为yyyy-MM-dd HH:mm:ss格式字符串时间
+                createOrderVo.setExpectTime(DateUtil.convert2String(takeMealDateTime, "yyyy-MM-dd HH:mm:ss"));
+            }else {
+                if (isAdvanceOrder) {
                     //fisherman-ka 预定单校验是否在预计开业时间范围内, 2. 校验 营业结束前十分钟,不允许下预约单(上面有代码,可以复用)
                     if (Objects.isNull(businessInfoDto)) {
                         businessInfoDto = this.queryBusinessInfoNew(createOrderVo);
                     }
-                    this.checkAdvanceOrderExpectTime(businessInfoDto,storeResponseDto,takeMealDateTime);
+                    Date date = new Date(Long.parseLong(takeMealTimes));
+                    this.checkAdvanceOrderExpectTime(businessInfoDto,storeResponseDto,date);
+                    createOrderVo.setExpectTime(DateUtil.convert2String(date, "yyyy-MM-dd HH:mm:ss"));
                 }
-                //重新赋值为yyyy-MM-dd HH:mm:ss格式字符串时间
-                createOrderVo.setExpectTime(DateUtil.convert2String(takeMealDateTime, "yyyy-MM-dd HH:mm:ss"));
             }
         }