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 425a1f4ec..3a8bc08c2 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 @@ -35,6 +35,7 @@ import java.util.*; import java.util.stream.Collectors; import static com.cool.store.enums.point.ShopSubStageStatusEnum.*; +import static com.cool.store.utils.poi.DateUtils.YYYY_MM_DD_HH_MM_SS; /** * @Author suzhuhong @@ -588,12 +589,14 @@ public class DeskServiceImpl implements DeskService { List deskStageDTOS = deskStageMap.get(shopStageInfoDO.getShopId()); if (CollectionUtils.isEmpty(deskStageDTOS)) { DeskStageDTO dto = new DeskStageDTO(); - dto.setActualCompleteTime(shopStageInfoDO.getActualCompleteTime()); + Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); + dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageMap.put(shopStageInfoDO.getShopId(), Collections.singletonList(dto)); } else { DeskStageDTO dto = new DeskStageDTO(); - dto.setActualCompleteTime(shopStageInfoDO.getActualCompleteTime()); + Date date = DateUtils.dateTime(YYYY_MM_DD_HH_MM_SS, shopStageInfoDO.getActualCompleteTime()); + dto.setActualCompleteTime(DateUtils.parseDateToStr(DateUtils.SPECIAL_DATE_START, date)); dto.setShopSubStageStatus(shopStageInfoDO.getShopSubStageStatus()); deskStageDTOS.add(dto); deskStageMap.put(shopStageInfoDO.getShopId(), deskStageDTOS);