Commit 9fbde580 by ping.wu

兼容门店隔日预约单格式修改,HH:mm变yyyy-MM-dd HH:mm,前端未升级,未按要求传

parent 1114f056
...@@ -343,7 +343,6 @@ public class CheckOrder { ...@@ -343,7 +343,6 @@ public class CheckOrder {
} }
} }
public Date getOrderExpectTime(String takeMealFlag,String takeMealTimes,String expectTime, public Date getOrderExpectTime(String takeMealFlag,String takeMealTimes,String expectTime,
CreateOrderType createOrderType,Integer serviceTime,StoreResponse.BizVO storeResponseDto){ CreateOrderType createOrderType,Integer serviceTime,StoreResponse.BizVO storeResponseDto){
Date takeMealDateTime = null; Date takeMealDateTime = null;
...@@ -354,9 +353,14 @@ public class CheckOrder { ...@@ -354,9 +353,14 @@ public class CheckOrder {
if (StringUtils.isBlank(takeMealTimes) && StringUtils.isBlank(expectTime)) { if (StringUtils.isBlank(takeMealTimes) && StringUtils.isBlank(expectTime)) {
return takeMealDateTime; return takeMealDateTime;
} }
//兼容门店隔日预约单格式修改,HH:mm变yyyy-MM-dd HH:mm,前端未升级,未按要求传
if (StringUtils.isNotBlank(takeMealTimes) && takeMealTimes.length() > 5) {
expectTime = takeMealTimes+":00";
}
Date date = new Date(); Date date = new Date();
if (StringUtils.isNotBlank(takeMealTimes)) { //takeMealTimes格式必须为HH:mm
if (StringUtils.isNotBlank(takeMealTimes) && takeMealTimes.length() == 5) {
StringBuffer takeMealTime = new StringBuffer(""); StringBuffer takeMealTime = new StringBuffer("");
takeMealTime = takeMealTime.append(DateUtil.convert2String(date, "yyyy-MM-dd")) takeMealTime = takeMealTime.append(DateUtil.convert2String(date, "yyyy-MM-dd"))
.append(" ").append(takeMealTimes).append(":00"); .append(" ").append(takeMealTimes).append(":00");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment