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

Merge branch 'dev/feat/partner1.6_20231226' into pre

Browse Source
This commit is contained in:
苏竹红
2023-12-20 13:46:13 +08:00
parent d8dfbeda5a 118678c7ef
commit d3c2ae885a
6 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java
View File

@@ -68,6 +68,7 @@ public class CommonConstants {
public static final String SQUAREBRACKETSRIGHT = "]";
public static final String PATH_SPILT = "/";
public static final String PATH_BAR = "-";
public static final String ROOT_REGION_PATH = "/1/";
/**

2
coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml
View File

@@ -322,6 +322,8 @@
start_date as startDate,
close_time as closeTime,
location as location,
closed_type as closedType,
creator as creator,
exhibition_name as exhibitionName,
collaborators as collaboratorStr
from hy_exhibition

4
coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java
View File

@@ -27,6 +27,10 @@ public class ExhibitionDTO {
private String collaboratorStr;
private String creator;
private Integer closedType;
private List<CollaboratorDTO> collaborators;
}

4
coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java
View File

@@ -18,6 +18,10 @@ public class ExhibitionVO {
private String startDate;
private Integer closedType;
private String createId;
private Integer id;
private List<CollaboratorVO> collaborators;

6
coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java
View File

@@ -330,7 +330,9 @@ public class ExhibitionServiceImpl implements ExhibitionService {
list.forEach(exhibitionDTO->{
ExhibitionVO exhibitionVO = new ExhibitionVO();
exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate());
exhibitionVO.setCreateId(exhibitionDTO.getCreator());
exhibitionVO.setClosedType(exhibitionDTO.getClosedType());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT));
exhibitionVO.setId(exhibitionDTO.getId());
exhibitionVOS.add(exhibitionVO);
});
@@ -368,7 +370,7 @@ public class ExhibitionServiceImpl implements ExhibitionService {
exhibitionDTOS.forEach(exhibitionDTO->{
ExhibitionVO exhibitionVO = new ExhibitionVO();
exhibitionVO.setExhibitionName(exhibitionDTO.getExhibitionName());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate());
exhibitionVO.setStartDate(exhibitionDTO.getStartDate().replace(CommonConstants.PATH_BAR,CommonConstants.PATH_SPILT));
exhibitionVO.setLocation(exhibitionDTO.getLocation());
exhibitionVO.setId(exhibitionDTO.getId());
//需要加载协作人才加载 不需要的时候 不加载

2
coolstore-partner-webb/src/main/resources/bootstrap.properties
View File

@@ -1,5 +1,5 @@
spring.application.name=hsay-partner-webb
spring.profiles.active=dev
spring.profiles.active=de
server.port=31000
server.servlet.context-path=/partner/pc