diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 70e93c0cd..4ea75bed9 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -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/"; /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index aff427604..fda49919d 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -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 diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml index 0ef1287f3..ad319443a 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyPartnerExhibitionMapper.xml @@ -426,10 +426,10 @@ on hpe.partner_id = hpui.partner_id - hpui.username like concat("%", #{partnerName}, "%") + and hpui.username like concat("%", #{partnerName}, "%") - hpe.exhibition_id = #{id} + and hpe.exhibition_id = #{id} diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java index e328c2af1..cf7d6abfd 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionDTO.java @@ -27,6 +27,10 @@ public class ExhibitionDTO { private String collaboratorStr; + private String creator; + + private Integer closedType; + private List collaborators; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java index b57fe5209..4507e968e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/exhibition/ExhibitionLineDTO.java @@ -22,7 +22,7 @@ public class ExhibitionLineDTO { private Integer wantShopArea; - private Integer wantShopAreaName; + private String wantShopAreaName; private Integer participationStatus; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java index ad7662fbf..d3cd9a6b4 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionLineVO.java @@ -22,7 +22,7 @@ public class ExhibitionLineVO { private Integer wantShopArea; - private Integer wantShopAreaName; + private String wantShopAreaName; private Integer participationStatus; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java index dd10ac5b5..eb16c07e1 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/exhibition/ExhibitionVO.java @@ -18,6 +18,10 @@ public class ExhibitionVO { private String startDate; + private Integer closedType; + + private String createId; + private Integer id; private List collaborators; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java index 0958c7ccd..cf8cd153e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/exhibition/ExhibitionServiceImpl.java @@ -35,6 +35,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -85,8 +86,8 @@ public class ExhibitionServiceImpl implements ExhibitionService { @Resource HyPartnerUserInfoDAO hyPartnerUserInfoDAO; -// @Value("${offline.exhibition.channel.id}") -// private Integer offlineExhibition; + @Value("${offline.exhibition.channel.id:null}") + private String offlineExhibition; @Override @Transactional @@ -279,7 +280,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { myExhibitionVO.setLocation(x.getLocation()); myExhibitionVO.setId(x.getId()); myExhibitionVO.setClosedType(x.getClosedType()); - myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),DateUtils.DATE_FORMAT_10)); + myExhibitionVO.setStartDate(DateUtils.format(x.getStartDate(),CoolDateUtils.DATE_FORMAT_DAY_2)); if (StringUtils.isNotEmpty(x.getCollaborators())){ List userIdList = Arrays.asList(x.getCollaborators().substring(1).split(Constants.COMMA)); List coll = new ArrayList<>(); @@ -329,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); }); @@ -367,8 +370,10 @@ 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.setClosedType(exhibitionDTO.getClosedType()); + exhibitionVO.setCreateId(exhibitionDTO.getCreator()); exhibitionVO.setId(exhibitionDTO.getId()); //需要加载协作人才加载 不需要的时候 不加载 if (includeCollaborators&&StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){ @@ -528,7 +533,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { partnerId = UUIDUtils.get32UUID(); HyPartnerUserInfoDO resultUser = new HyPartnerUserInfoDO(); resultUser.setUsername(signUpExhibitionDTO.getPartnerName()).setMobile(signUpExhibitionDTO.getMobile()).setPartnerId(partnerId).setCreateTime(new Date()) - .setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(111111111); + .setWantShopArea(signUpExhibitionDTO.getWantShopArea()).setUserChannelId(Integer.valueOf(offlineExhibition)); hyPartnerUserInfoDAO.insertSelective(resultUser); } HyPartnerLineInfoDO resultLine = new HyPartnerLineInfoDO(); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java index 064596b93..53cc773b7 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -45,12 +45,12 @@ public class ExhibitionController { @GetMapping(value = "/getMyExhibitionList") @ApiOperation("我的会销") - public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedTye") String closedTye, + public ResponseResult getMyExhibitionList(@RequestParam(required = false,value = "closedType") String closedType, @RequestParam(required = false,value = "startDate") String startDate, @RequestParam(required = false,value = "pageNum") Integer pageNum, @RequestParam(required = false,value = "pageSize") Integer pageSize) { LoginUserInfo user = CurrentUserHolder.getUser(); - return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),closedTye,startDate,pageSize,pageNum)); + return ResponseResult.success(exhibitionService.getMyExhibitionList(user.getUserId(),startDate ,closedType,pageSize,pageNum)); } @GetMapping(value = "/getMyExhibitionGroupList")