suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间

Browse Source
This commit is contained in:
苏竹红
2024-04-09 17:13:27 +08:00
parent 902905e2ea
commit f9e69f7014
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-model/src/main/java/com/cool/store/vo/OpenAreaVO.java
View File

@@ -41,7 +41,7 @@ public class OpenAreaVO {
private Date createTime; private Date createTime;
@ApiModelProperty("更新时间") @ApiModelProperty("更新时间")
private Date updateTime; private String updateTime;
@ApiModelProperty("更新人") @ApiModelProperty("更新人")
private String updateUserId; private String updateUserId;

2
coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.cool.store.service.impl; package com.cool.store.service.impl;
import com.alibaba.excel.util.DateUtils;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants; import com.cool.store.constants.CommonConstants;
@@ -175,6 +176,7 @@ public class OpenAreaServiceImpl implements OpenAreaService {
hyOpenAreaInfoDOList.stream().forEach(x->{ hyOpenAreaInfoDOList.stream().forEach(x->{
OpenAreaVO openAreaVO = convertDoToVo(x); OpenAreaVO openAreaVO = convertDoToVo(x);
openAreaVO.setUpdateUserName(userMap.get(x.getUpdateUserId())); openAreaVO.setUpdateUserName(userMap.get(x.getUpdateUserId()));
openAreaVO.setUpdateTime(DateUtils.format(x.getUpdateTime(),DateUtils.DATE_FORMAT_19));
list.add(openAreaVO); list.add(openAreaVO);
}); });
hyOpenAreaInfoDOPageInfo.setList(list); hyOpenAreaInfoDOPageInfo.setList(list);

2
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java
View File

@@ -64,7 +64,7 @@ public class OpenAreaController {
@PostMapping(path = "/changeOpenAreaStatus") @PostMapping(path = "/changeOpenAreaStatus")
@ApiOperation("变更开放区域状态") @ApiOperation("变更开放区域状态")
public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){ public ResponseResult<Boolean> changeOpenAreaStatus(@RequestBody OpenAreaRequest openAreaRequest){
String userId = ""; String userId = CurrentUserHolder.getUserId();
return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest)); return ResponseResult.success(openAreaService.batchUpdate( userId, openAreaRequest));
} }

2
coolstore-partner-web/src/main/resources/application.properties
View File

@@ -1,5 +1,5 @@
spring.application.name=hsay-partner-web spring.application.name=hsay-partner-web
spring.profiles.active=@profileActive@ spring.profiles.active=test
server.port=40000 server.port=40000
server.servlet.context-path=/xfsg server.servlet.context-path=/xfsg