Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of…

Merge branches 'develop' and 'feature/20200720_预约单取餐时间字段格式兼容_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/pom.xml
#	ordercenter-sdk/readme.md
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java

order-application-service/pom.xml

@@ -88,7 +88,7 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>storecenter-sdk</artifactId>
-            <version>3.0.1-SNAPSHOT</version>
+            <version>3.1.1.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud</groupId>

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

@@ -343,7 +343,6 @@ public class CheckOrder {
         }
     }
 
-
     public Date getOrderExpectTime(String takeMealFlag,String takeMealTimes,String expectTime,
                                      CreateOrderType createOrderType,Integer serviceTime,StoreResponse.BizVO storeResponseDto){
         Date takeMealDateTime = null;
@@ -354,9 +353,14 @@ public class CheckOrder {
         if (StringUtils.isBlank(takeMealTimes) && StringUtils.isBlank(expectTime)) {
             return takeMealDateTime;
         }
+        //兼容门店隔日预约单格式修改，HH:mm变yyyy-MM-dd HH:mm，前端未升级，未按要求传
+        if (StringUtils.isNotBlank(takeMealTimes) && takeMealTimes.length() > 5) {
+            expectTime = takeMealTimes+":00";
+        }
 
         Date date = new Date();
-        if (StringUtils.isNotBlank(takeMealTimes)) {
+        //takeMealTimes格式必须为HH:mm
+        if (StringUtils.isNotBlank(takeMealTimes) && takeMealTimes.length() <= 5) {
             StringBuffer takeMealTime = new StringBuffer("");
             takeMealTime = takeMealTime.append(DateUtil.convert2String(date, "yyyy-MM-dd"))
                     .append(" ").append(takeMealTimes).append(":00");