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

order-application-service/src/main/java/cn/freemud/entities/dto/store/BusinessInfoDto.java

@@ -38,10 +38,6 @@ public class BusinessInfoDto {
     private Integer deliveryProcessingAfterMinute;
     private Integer deliveryProcessingBeforeMinute;
     private Integer orderProgressBarStatus;
-    /**
-     *  是否开启 预定单功能 1开 0关
-     */
-    private Integer preOrderSwitch;
 
     private ExpandFields expandFields;
 

order-application-service/src/main/java/cn/freemud/entities/dto/store/ExpandFields.java

@@ -26,5 +26,9 @@ public class ExpandFields {
 
     //每增加一公里增加的时长（分钟）
     private String appendMinutePerKilometer;
+    /**
+     *  是否开启 预定单功能 1开 0关
+     */
+    private Integer preOrderSwitch;
 
 }

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

@@ -411,13 +411,13 @@ public class CheckOrder {
      * @param storeResponseDto
      */
     private void checkAdvanceOrderExpectTime(BusinessInfoDto queryBusinessInfoNew,StoreResponse.BizVO storeResponseDto, Date takeMealDateTime) {
-        AssortOrderLogUtil.info("fisherman 校验门店时间数据 01",JSON.toJSONString(queryBusinessInfoNew),
+        AssortOrderLogUtil.info("fisherman 校验门店时间数据 01",null,
                 JSON.toJSONString(storeResponseDto),
                 JSON.toJSONString(takeMealDateTime));
         if (Objects.isNull(queryBusinessInfoNew)) {
             return;
         }
-        if (ObjectUtils.notEqual(queryBusinessInfoNew.getPreOrderSwitch(), 1)) {
+        if (ObjectUtils.notEqual(queryBusinessInfoNew.getExpandFields().getPreOrderSwitch(), 1)) {
             // 没开启 抛出异常
             throw new ServiceException(ResponseResult.STORE_ITEM_NOT_ADVANCE);
         }