diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java index c7ffc27af..bed676501 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DeskServiceImpl.java @@ -687,13 +687,13 @@ public class DeskServiceImpl implements DeskService { List deskStageDTOS = deskStageMap.get(shopStageInfoDO.getShopId()); if (CollectionUtils.isEmpty(deskStageDTOS)) { DeskStageDTO dto = new DeskStageDTO(); - Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); + Date date = DateUtils.toDate(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageMap.put(shopStageInfoDO.getShopId(), Arrays.asList(dto)); } else { DeskStageDTO dto = new DeskStageDTO(); - Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); + Date date = DateUtils.toDate(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); dto.setActualCompleteTime(DateUtils.parseDateToStr(SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageDTOS.add(dto); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/DateUtils.java b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/DateUtils.java index db55de971..28c0255ae 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/DateUtils.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/utils/poi/DateUtils.java @@ -111,6 +111,17 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { } } + public static Date toDate(final String format, final String ts) { + if (StringUtils.isEmpty(format)|| ObjectUtils.isEmpty(ts)){ + return null; + } + try { + return new SimpleDateFormat(format).parse(ts); + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + /** * 日期路径 即年/月/日 如2018/08/08 */