From f9e69f701435ed0a0d66d1e89c8400fd47d5d8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 9 Apr 2024 17:13:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/OpenAreaVO.java | 2 +- .../java/com/cool/store/service/impl/OpenAreaServiceImpl.java | 2 ++ .../java/com/cool/store/controller/webb/OpenAreaController.java | 2 +- coolstore-partner-web/src/main/resources/application.properties | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java index a00da02f4..2474265d2 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java @@ -41,7 +41,7 @@ public class OpenAreaVO { private Date createTime; @ApiModelProperty("更新时间") - private Date updateTime; + private String updateTime; @ApiModelProperty("更新人") private String updateUserId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index 13f70a1d5..dea6a4f70 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.alibaba.excel.util.DateUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; @@ -175,6 +176,7 @@ public class OpenAreaServiceImpl implements OpenAreaService { hyOpenAreaInfoDOList.stream().forEach(x->{ OpenAreaVO openAreaVO = convertDoToVo(x); openAreaVO.setUpdateUserName(userMap.get(x.getUpdateUserId())); + openAreaVO.setUpdateTime(DateUtils.format(x.getUpdateTime(),DateUtils.DATE_FORMAT_19)); list.add(openAreaVO); }); hyOpenAreaInfoDOPageInfo.setList(list); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java index f5ab3f0ab..71e331769 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java @@ -64,7 +64,7 @@ public class OpenAreaController { @PostMapping(path = "/changeOpenAreaStatus") @ApiOperation("变更开放区域状态") public ResponseResult changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ - String userId = ""; + String userId = CurrentUserHolder.getUserId(); return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); } diff --git a/coolstore-partner-web/src/main/resources/application.properties b/coolstore-partner-web/src/main/resources/application.properties index 2a707966a..39d308f91 100644 --- a/coolstore-partner-web/src/main/resources/application.properties +++ b/coolstore-partner-web/src/main/resources/application.properties @@ -1,5 +1,5 @@ spring.application.name=hsay-partner-web -spring.profiles.active=@profileActive@ +spring.profiles.active=test server.port=40000 server.servlet.context-path=/xfsg