diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java index fffab2884..6f7d8f3cc 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyExhibitionDAO.java @@ -101,11 +101,11 @@ public class HyExhibitionDAO { return result.stream().collect(Collectors.toMap(ExhibitionStatisticsDTO::getExhibitionCode, date -> date)); } - public List listByExhibitionGroupIds(List exhibitionGroupIdList){ + public List listByExhibitionGroupIds(List exhibitionGroupIdList,Boolean filterCloseExhibition){ if (CollectionUtils.isEmpty(exhibitionGroupIdList)){ return new ArrayList<>(); } - return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList); + return hyExhibitionMapper.listByExhibitionGroupIds(exhibitionGroupIdList,filterCloseExhibition); } public Integer lineSignUpCount(Integer exhibitionGroupId, Long lineId){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java index 2a3b0223d..5149db9b4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyExhibitionMapper.java @@ -54,7 +54,7 @@ public interface HyExhibitionMapper { List exhibitionStatistic(@Param("list") List exhibitionCodeList); - List listByExhibitionGroupIds(@Param("list") List exhibitionGroupIdList); + List listByExhibitionGroupIds(@Param("list") List exhibitionGroupIdList, @Param("filterCloseExhibition") Boolean filterCloseExhibition); Integer lineSignUpCount(@Param("exhibitionGroupId") Integer exhibitionGroupId, @Param("lineId") Long lineId); diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml index 11f6e7fce..bf572047f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyExhibitionMapper.xml @@ -276,6 +276,9 @@ #{groupId} + + and closed_type = 0 + order by id asc diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java new file mode 100644 index 000000000..344db257d --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/partner/PartnerUserBaseVO.java @@ -0,0 +1,30 @@ +package com.cool.store.vo.partner; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author suzhuhong + * @Date 2023/12/13 16:38 + * @Version 1.0 + */ +@Data +public class PartnerUserBaseVO { + + @ApiModelProperty("手机号") + private String mobile; + + @ApiModelProperty("申请人姓名") + private String partnerName; + + @ApiModelProperty("意向开店区域") + private String wantShopArea; + + + public PartnerUserBaseVO() {} + public PartnerUserBaseVO(String mobile, String partnerName, String wantShopArea) { + this.mobile = mobile; + this.partnerName = partnerName; + this.wantShopArea = wantShopArea; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java index 00a43115f..0b069c572 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ExhibitionService.java @@ -70,9 +70,11 @@ public interface ExhibitionService { /** * 会销组详情 * @param exhibitionGroupId + * @param includeCollaborators true-包含协作人信息 false_不包含 + * @param filterCloseExhibition true-过滤关闭的会销 false-不过滤关闭的会销 * @return */ - ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId); + ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId,Boolean includeCollaborators,Boolean filterCloseExhibition); /** * 会销详情 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java index a6a999d13..75d1fa7de 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/PartnerUserInfoService.java @@ -5,6 +5,7 @@ import com.cool.store.exception.ApiException; import com.cool.store.request.PartnerUserInfoRequest; import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; +import com.cool.store.vo.partner.PartnerUserBaseVO; public interface PartnerUserInfoService { @@ -18,4 +19,5 @@ public interface PartnerUserInfoService { ApplyBaseInfoVO updatePartnerUserInfo(PartnerUserInfoRequest partnerUserInfoRequest) throws ApiException; + PartnerUserBaseVO getPartnerInfo(String mobile); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java index caa5344f0..439ff60ea 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PartnerUserInfoServiceImpl.java @@ -7,6 +7,7 @@ import com.cool.store.context.PartnerUserHolder; import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.dao.HyPartnerUserInfoDAO; import com.cool.store.dto.log.UserInfoUpdateDTO; +import com.cool.store.dto.partner.MobileCheckDTO; import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.HyPartnerLineInfoDO; import com.cool.store.entity.HyPartnerUserInfoDO; @@ -22,6 +23,7 @@ import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.ApplyBaseInfoVO; import com.cool.store.vo.InviteCodeDetailVO; import com.cool.store.vo.PartnerUserInfoVO; +import com.cool.store.vo.partner.PartnerUserBaseVO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -152,6 +154,15 @@ public class PartnerUserInfoServiceImpl implements PartnerUserInfoService { return applyBaseInfoVO; } + @Override + public PartnerUserBaseVO getPartnerInfo(String mobile) { + HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByMobile(mobile); + if (hyPartnerUserInfoDO == null){ + return null; + } + return new PartnerUserBaseVO(hyPartnerUserInfoDO.getMobile(),hyPartnerUserInfoDO.getUsername(),hyPartnerUserInfoDO.getWantShopArea()); + } + private void fillUserInfoDOByRequest(HyPartnerUserInfoDO hyPartnerUserInfoDO, PartnerUserInfoRequest partnerUserInfoRequest) { hyPartnerUserInfoDO.setUsername(partnerUserInfoRequest.getUsername()); hyPartnerUserInfoDO.setMobile(partnerUserInfoRequest.getMobile()); 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 09452c2d3..63a8a2fbc 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 @@ -309,7 +309,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { return myExhibitionGroupDTOPage; } List groupIds = myExhibitionGroupDTOS.stream().map(MyExhibitionGroupDTO::getId).collect(Collectors.toList()); - List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(groupIds); + List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(groupIds,Boolean.FALSE); Map> groupMap = exhibitionDTOS.stream().collect(Collectors.groupingBy(ExhibitionDTO::getExhibitionGroupId)); List result = new ArrayList<>(); @@ -351,7 +351,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { } @Override - public ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId) { + public ExhibitionGroupDetailVO getExhibitionGroupDetail(Integer exhibitionGroupId,Boolean includeCollaborators,Boolean filterCloseExhibition) { //查询标签组 HyExhibitionGroupDO hyExhibitionGroupDO = hyExhibitionGroupDAO.selectByPrimaryKey(exhibitionGroupId); if (ObjectUtils.isEmpty(hyExhibitionGroupDO)){ @@ -360,7 +360,7 @@ public class ExhibitionServiceImpl implements ExhibitionService { ExhibitionGroupDetailVO exhibitionGroupDetailVO = new ExhibitionGroupDetailVO(); exhibitionGroupDetailVO.setExhibitionGroupName(hyExhibitionGroupDO.getExhibitionGroupName()); exhibitionGroupDetailVO.setId(hyExhibitionGroupDO.getId()); - List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(Arrays.asList(exhibitionGroupId)); + List exhibitionDTOS = hyExhibitionDAO.listByExhibitionGroupIds(Arrays.asList(exhibitionGroupId),filterCloseExhibition); List exhibitionVOS = new ArrayList<>(); //会销对应的会销协作人map Map resultMap = getExhibitionCollaboratorMap(exhibitionDTOS); @@ -371,8 +371,9 @@ public class ExhibitionServiceImpl implements ExhibitionService { exhibitionVO.setStartDate(exhibitionDTO.getStartDate()); exhibitionVO.setLocation(exhibitionDTO.getLocation()); exhibitionVO.setId(exhibitionDTO.getId()); - if (StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){ - List userIdList = Arrays.asList(exhibitionDTO.getCollaboratorStr().substring(1).split(Constants.COMMA)); + //需要加载协作人才加载 不需要的时候 不加载 + if (includeCollaborators&&StringUtils.isNotEmpty(exhibitionDTO.getCollaboratorStr())){ + List userIdList = Arrays.asList(exhibitionDTO.getCollaboratorStr().substring(CommonConstants.ONE).split(Constants.COMMA)); List coll = new ArrayList<>(); userIdList.forEach(userIds->{ coll.add(resultMap.get(userIds)); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java index ca57954a2..9a3a64b8d 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java @@ -12,6 +12,7 @@ import com.cool.store.service.*; import com.cool.store.vo.*; import com.cool.store.vo.interview.InterviewVO; import com.cool.store.vo.partner.PartnerSimpleBaseInfoVO; +import com.cool.store.vo.partner.PartnerUserBaseVO; import com.github.pagehelper.PageInfo; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -346,4 +347,10 @@ public class DeskController { public ResponseResult queryBaseInfo(@RequestParam(value = "partnerLineId")Long partnerLineId){ return ResponseResult.success(hyPartnerLineInfoService.queryBaseInfo(partnerLineId)); } + + @GetMapping(path = "/getPartnerInfo") + @ApiOperation("线索基本信息") + public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile){ + return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile)); + } } 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 3a8dc756e..064596b93 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 @@ -65,7 +65,7 @@ public class ExhibitionController { @GetMapping(value = "/getExhibitionGroupDetail") @ApiOperation("会销组详情") public ResponseResult getExhibitionGroupDetail(@RequestParam(required = false,value = "exhibitionGroupId") Integer exhibitionGroupId) { - return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId)); + return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId,Boolean.TRUE,Boolean.FALSE)); } @@ -138,4 +138,6 @@ public class ExhibitionController { return ResponseResult.success(exhibitionService.closeExhibition(exhibitionId,user)); } + + } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java index ff56ac318..4082b8c81 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/ExhibitionController.java @@ -10,10 +10,7 @@ import com.cool.store.vo.exhibition.SignUpExhibitionVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -38,4 +35,10 @@ public class ExhibitionController { return ResponseResult.success(exhibitionService.signUpExhibition(dto,new LoginUserInfo())); } + @GetMapping(value = "/getExhibitionList") + @ApiOperation("会销组详情") + public ResponseResult getExhibitionGroupDetail(@RequestParam(required = false,value = "exhibitionGroupId") Integer exhibitionGroupId) { + return ResponseResult.success(exhibitionService.getExhibitionGroupDetail(exhibitionGroupId,Boolean.FALSE,Boolean.TRUE)); + } + } diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index ecd8ac7d3..7f221b8a2 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -14,6 +14,7 @@ import com.cool.store.service.*; import com.cool.store.utils.RedisUtilPool; import com.cool.store.vo.*; import com.cool.store.vo.cuser.IdentityCardInfoVO; +import com.cool.store.vo.partner.PartnerUserBaseVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -254,4 +255,10 @@ public class PartnerController { } } + @GetMapping(path = "/getPartnerInfo") + @ApiOperation("线索基本信息") + public ResponseResult getPartnerInfo(@RequestParam(value = "mobile")String mobile){ + return ResponseResult.success(partnerUserInfoService.getPartnerInfo(mobile)); + } + }