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

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

@@ -66,7 +66,6 @@ import com.freemud.application.sdk.api.storecenter.response.QueryDeliverDetailRe
 import com.freemud.application.sdk.api.storecenter.response.StoreResponse;
 import com.freemud.application.sdk.api.storecenter.service.StoreCenterService;
 import com.freemud.sdk.api.assortment.order.enums.StoreDeliveryMethod;
-import com.freemud.sdk.api.assortment.order.util.AssortOrderLogUtil;
 import com.google.common.collect.Lists;
 import com.google.gson.Gson;
 import org.apache.commons.collections4.CollectionUtils;
@@ -411,8 +410,7 @@ public class CheckOrder {
      * @param storeResponseDto
      */
     private void checkAdvanceOrderExpectTime(BusinessInfoDto queryBusinessInfoNew,StoreResponse.BizVO storeResponseDto, Date takeMealDateTime) {
-        AssortOrderLogUtil.info("fisherman 校验门店时间数据 01",null,
-                JSON.toJSONString(storeResponseDto),
+        AppLogUtil.infoLog("fisherman 校验门店时间数据 01", JSON.toJSONString(storeResponseDto),
                 JSON.toJSONString(takeMealDateTime));
         if (Objects.isNull(queryBusinessInfoNew)) {
             return;
@@ -428,7 +426,7 @@ public class CheckOrder {
         }
         for (String bussinessTime : nextDayBusinessTime) {
             BusinessDate bussinessTime2 = this.getStoreBusinessDate(bussinessTime, true);
-            AssortOrderLogUtil.info("fisherman 校验门店时间数据 02",JSON.toJSONString(bussinessTime2));
+            AppLogUtil.infoLog("fisherman 校验门店时间数据 02", JSON.toJSONString(bussinessTime2),null);
             // 取餐时间在营业时间前面, 或者在营业结束时间后面
             boolean isTrue = takeMealDateTime.before(bussinessTime2.getStartDate()) || takeMealDateTime.after(bussinessTime2.getEndDate());
             if (isTrue) {
@@ -447,7 +445,7 @@ public class CheckOrder {
         for (String todayTime : todayBusinessTimes) {
             //每段营业时间校验
             BusinessDate businessDate2 = this.getStoreBusinessDate(todayTime, true);
-            AssortOrderLogUtil.info("fisherman 校验门店时间数据 03",JSON.toJSONString(businessDate2));
+            AppLogUtil.infoLog("fisherman 校验门店时间数据 03", JSON.toJSONString(businessDate2),null);
             if (createOrder.after(businessDate2.getEndDate())) {
                 throw new ServiceException(ResponseResult.ORDER_TAKEMEALTIME_INVAILD);
             }