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

Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

Browse Source 
# Conflicts:
#	coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java
This commit is contained in:
zhangchenbiao
2023-06-20 13:44:36 +08:00
parent 34f25bb62d 8296e70f26
commit 300faf9964
18 changed files with 132 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java
View File

@@ -61,7 +61,7 @@ public enum ErrorCodeEnum {
INTERVIEW_ENTER_FAIL(1021101, "进入面试间失败", null),
DINGDING_USER_NOT_EXIST(1021102, "用户钉钉信息不存在，无法发起资质审核！", null),
INTERVIEW_NOT_EXIST(1021103, "面试信息不存在！", null),
INTERVIEW_AND_PARTNER_ID_IS_NULL(1021104, "加盟商用户ID和面试官ID不能同时为空！", null),
INTERVIEW_AND_PARTNER_ID_IS_NULL(1021104, "加盟商用户ID&线索ID和面试官ID不能同时为空！", null),
INTERVIEW_PLAN_IS_NULL(1021105, "未查询到相关面试安排！", null),
DATE_PARAMS_IS_ERROR(1021106, "日期参数错误！", null),
INTERVIEW_PLAN_NOT_EXIST(1021107, "面试计划不存在！", null),

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java
View File

@@ -29,8 +29,8 @@ public class HyOpenAreaInfoDAO {
return hyOpenAreaInfoMapper.queryKeyOpenArea();
}
public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,String areaStatus,Boolean filterData){
return hyOpenAreaInfoMapper.queryByKeyword(keyword,areaStatus,filterData);
public List<HyOpenAreaInfoDO> queryByKeyword(String keyword,Boolean applyFlag,String areaStatus,Boolean filterData){
return hyOpenAreaInfoMapper.queryByKeyword(keyword,applyFlag,areaStatus,filterData);
}
public List<HyOpenAreaInfoDO> queryFirstLevel(){

4
coolstore-partner-dao/src/main/java/com/cool/store/dao/HyPartnerLineInfoDAO.java
View File

@@ -131,9 +131,9 @@ public class HyPartnerLineInfoDAO {
}
public List<PrivateSeaLineDTO> getPrivateSeaLineList(String keyword, String keywordType, String workflowStage, String workflowStatus, Date deadlineStart, Date deadlineEnd,
String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList){
String intentArea, Integer acceptAdjustType, String storeKeyword, String storeKeywordType, List<String> userIdList,List<String> developmentManagerList){
return hyPartnerLineInfoMapper.getPrivateSeaLineList( keyword, keywordType, workflowStage, workflowStatus, deadlineStart, deadlineEnd,
intentArea, acceptAdjustType, storeKeyword, storeKeywordType, userIdList);
intentArea, acceptAdjustType, storeKeyword, storeKeywordType, userIdList,developmentManagerList);
}

1
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java
View File

@@ -41,6 +41,7 @@ public interface HyOpenAreaInfoMapper {
* @return
*/
List<HyOpenAreaInfoDO> queryByKeyword(@Param("keyword") String keyword,
@Param("applyFlag") Boolean applyFlag,
@Param("areaStatus") String areaStatus,
@Param("filterData") Boolean filterData);

2
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerInterviewMapper.java
View File

@@ -18,7 +18,7 @@ public interface HyPartnerInterviewMapper {
* 会对传进来的字段做判空处理，如果字段为空，则使用数据库默认字段或者null
* dateTime:2023-06-09 05:51
*/
int insertSelective(HyPartnerInterviewDO record);
int insertSelective(@Param("record") HyPartnerInterviewDO record);
/**
*

3
coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyPartnerLineInfoMapper.java
View File

@@ -173,7 +173,8 @@ public interface HyPartnerLineInfoMapper {
@Param("acceptAdjustType") Integer acceptAdjustType,
@Param("storeKeyword") String storeKeyword,
@Param("storeKeywordType") String storeKeywordType,
@Param("userIdList") List<String> userIdList);
@Param("userIdList") List<String> userIdList,
@Param("developmentManagerList") List<String> developmentManagerList);
/**

126
coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml
View File

@@ -54,133 +54,133 @@
<insert id="insertSelective" keyColumn="id" keyProperty="record.id" useGeneratedKeys="true">
insert into hy_partner_interview
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="status != null">
<if test="record.status != null">
status,
</if>
<if test="partnerLineId != null">
<if test="record.partnerLineId != null">
partner_line_id,
</if>
<if test="interviewPlanId != null">
<if test="record.interviewPlanId != null">
interview_plan_id,
</if>
<if test="partnerId != null">
<if test="record.partnerId != null">
partner_id,
</if>
<if test="deadline != null">
<if test="record.deadline != null">
deadline,
</if>
<if test="interviewer != null">
<if test="record.interviewer != null">
interviewer,
</if>
<if test="recorder != null">
<if test="record.recorder != null">
recorder,
</if>
<if test="processInfo != null">
<if test="record.processInfo != null">
process_info,
</if>
<if test="recordTime != null">
<if test="record.recordTime != null">
record_time,
</if>
<if test="summary != null">
<if test="record.summary != null">
summary,
</if>
<if test="authCode != null">
<if test="record.authCode != null">
auth_code,
</if>
<if test="passFileUrl != null">
<if test="record.passFileUrl != null">
pass_file_url,
</if>
<if test="expiryDate != null">
<if test="record.expiryDate != null">
expiry_date,
</if>
<if test="latestLogMessage != null">
<if test="record.latestLogMessage != null">
latest_log_message,
</if>
<if test="passReason != null">
<if test="record.passReason != null">
pass_reason,
</if>
<if test="certifyFile != null">
<if test="record.certifyFile != null">
certify_file,
</if>
<if test="createTime != null">
<if test="record.createTime != null">
create_time,
</if>
<if test="updateTime != null">
<if test="record.updateTime != null">
update_time,
</if>
<if test="approveTime != null">
<if test="record.approveTime != null">
approve_time,
</if>
<if test="partnerEnterTime != null">
<if test="record.partnerEnterTime != null">
partner_enter_time,
</if>
<if test="interviewerEnterTime != null">
<if test="record.interviewerEnterTime != null">
interviewer_enter_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="status != null">
#{status},
<if test="record.status != null">
#{record.status},
</if>
<if test="partnerLineId != null">
#{partnerLineId},
<if test="record.partnerLineId != null">
#{record.partnerLineId},
</if>
<if test="interviewPlanId != null">
#{interviewPlanId},
<if test="record.interviewPlanId != null">
#{record.interviewPlanId},
</if>
<if test="partnerId != null">
#{partnerId},
<if test="record.partnerId != null">
#{record.partnerId},
</if>
<if test="deadline != null">
#{deadline},
<if test="record.deadline != null">
#{record.deadline},
</if>
<if test="interviewer != null">
#{interviewer},
<if test="record.interviewer != null">
#{record.interviewer},
</if>
<if test="recorder != null">
#{recorder},
<if test="record.recorder != null">
#{record.recorder},
</if>
<if test="processInfo != null">
#{processInfo},
<if test="record.processInfo != null">
#{record.processInfo},
</if>
<if test="recordTime != null">
#{recordTime},
<if test="record.recordTime != null">
#{record.recordTime},
</if>
<if test="summary != null">
#{summary},
<if test="record.summary != null">
#{record.summary},
</if>
<if test="authCode != null">
#{authCode},
<if test="record.authCode != null">
#{record.authCode},
</if>
<if test="passFileUrl != null">
#{passFileUrl},
<if test="record.passFileUrl != null">
#{record.passFileUrl},
</if>
<if test="expiryDate != null">
#{expiryDate},
<if test="record.expiryDate != null">
#{record.expiryDate},
</if>
<if test="latestLogMessage != null">
#{latestLogMessage},
<if test="record.latestLogMessage != null">
#{record.latestLogMessage},
</if>
<if test="passReason != null">
#{passReason},
<if test="record.passReason != null">
#{record.passReason},
</if>
<if test="certifyFile != null">
#{certifyFile},
<if test="record.certifyFile != null">
#{record.certifyFile},
</if>
<if test="createTime != null">
#{createTime},
<if test="record.createTime != null">
#{record.createTime},
</if>
<if test="updateTime != null">
#{updateTime},
<if test="record.updateTime != null">
#{record.updateTime},
</if>
<if test="approveTime != null">
#{approveTime},
<if test="record.approveTime != null">
#{record.approveTime},
</if>
<if test="partnerEnterTime != null">
#{partnerEnterTime},
<if test="record.partnerEnterTime != null">
#{record.partnerEnterTime},
</if>
<if test="interviewerEnterTime != null">
#{interviewerEnterTime},
<if test="record.interviewerEnterTime != null">
#{record.interviewerEnterTime},
</if>
</trim>
</insert>

11
coolstore-partner-dao/src/main/resources/mapper/HyPartnerLineInfoMapper.xml
View File

@@ -359,9 +359,9 @@
a.close_user_id as closeUserId,
a.close_time as closeTime,
a.join_black_reason as joinBlackReason
from hy_partner_line_info a inner join hy_partner_user_info b where a.partner_id = b.partner_id
where deleted = 0
and line_status = 3
from hy_partner_line_info a inner join hy_partner_user_info b on a.partner_id = b.partner_id
where a.deleted = 0
and a.line_status = 3
<if test="userNameKeyword!=null and userNameKeyword !=''">
and b.username like concat('%', #{userNameKeyword}, '%')
</if>
@@ -494,6 +494,11 @@
#{userId}
</foreach>
</if>
<if test="developmentManagerList!=null and developmentManagerList.size>0">
<foreach collection="developmentManagerList" item="developmentManager" open="and a.development_manager in (" close=")" separator=",">
#{developmentManager}
</foreach>
</if>
</select>

6
coolstore-partner-model/src/main/java/com/cool/store/request/GetFreeBusyListReq.java
View File

@@ -16,8 +16,10 @@ public class GetFreeBusyListReq {
private String startDate;
@ApiModelProperty(value = "结束时间",required = true)
private String endDate;
@ApiModelProperty("加盟商用户ID")
@ApiModelProperty("线索id(C端使用)")
private String lineId;
@ApiModelProperty("加盟商用户ID（C端使用，与面试官id两个字段中必传一个,该字段传值时，线索id必传）")
private String partnerId;
@ApiModelProperty("面试官ID(如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)")
@ApiModelProperty("面试官ID(B端使用,如果该字段传了，就查询该面试官的日程忙闲信息，否则查询加盟商对应的面试官的信息)")
private String interviewerId;
}

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

@@ -30,7 +30,7 @@ public interface OpenAreaService {
* @param flag
* @return
*/
List<OpenAreaTreeVO> queryAllOpenAreaByKeyword(String keyword,Boolean flag);
List<OpenAreaTreeVO> queryAllOpenAreaByKeyword(String keyword,Boolean applyFlag,Boolean flag);
/**

8
coolstore-partner-service/src/main/java/com/cool/store/service/impl/EnterpriseUserServiceImpl.java
View File

@@ -118,11 +118,11 @@ public class EnterpriseUserServiceImpl implements EnterpriseUserService {
result.setInvestmentUserIds(userList);
}
//开发区域
List<String> developementList = zoneInfoList.stream().filter(o -> "dev".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(developementList)){
List<String> developmentList = zoneInfoList.stream().filter(o -> "dev".equals(o.getType())).flatMap(o->JSONObject.parseArray(o.getAssociatedRegionId(), String.class).stream()).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(developmentList)){
//获取负责的区域
developementList.retainAll(subRegionIds);
List<String> userList = userRegionMappingDAO.getUserListByRegionIds(developementList);
developmentList.retainAll(subRegionIds);
List<String> userList = userRegionMappingDAO.getUserListByRegionIds(developmentList);
userList.add(userId);
result.setDevelopmentUserIds(userList);
}

18
coolstore-partner-service/src/main/java/com/cool/store/service/impl/FeiShuServiceImpl.java
View File

@@ -4,11 +4,13 @@ import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import com.cool.store.dto.calendar.UserFreeBusyInfoDTO;
import com.cool.store.entity.HyPartnerInterviewPlanDO;
import com.cool.store.entity.HyPartnerLineInfoDO;
import com.cool.store.enums.ErrorCodeEnum;
import com.cool.store.exception.ApiException;
import com.cool.store.exception.ServiceException;
import com.cool.store.http.ISVHttpRequest;
import com.cool.store.mapper.HyPartnerInterviewPlanMapper;
import com.cool.store.mapper.HyPartnerLineInfoMapper;
import com.cool.store.request.GetFreeBusyListReq;
import com.cool.store.service.FeiShuService;
import com.cool.store.vo.interview.CalendarInfo;
@@ -36,6 +38,9 @@ public class FeiShuServiceImpl implements FeiShuService {
@Autowired
private HyPartnerInterviewPlanMapper hyPartnerInterviewPlanMapper;
@Autowired
private HyPartnerLineInfoMapper hyPartnerLineInfoMapper;
@Override
public GetFreeBusyListVO getFreeBusyList(GetFreeBusyListReq request) throws ApiException {
GetFreeBusyListVO freeBusyListVO = new GetFreeBusyListVO();
@@ -43,22 +48,25 @@ public class FeiShuServiceImpl implements FeiShuService {
String endDate = request.getEndDate();//结束日期
String partnerId = request.getPartnerId();//加盟商用户ID
String interviewerId = request.getInterviewerId();//面试官ID
String lineId = request.getLineId();//线索id
//如果加盟商用户ID为空且面试官ID为空，返回错误信息
if (StringUtils.isEmpty(partnerId) && StringUtils.isEmpty(interviewerId)) {
if (!(StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) && StringUtils.isEmpty(interviewerId)) {
throw new ServiceException(ErrorCodeEnum.INTERVIEW_AND_PARTNER_ID_IS_NULL);
}
//如果加盟商用户ID不为空且面试官ID为空
if (StringUtils.isNotEmpty(partnerId) && StringUtils.isEmpty(interviewerId)) {
if (StringUtils.isNotEmpty(partnerId) && StringUtils.isNotEmpty(lineId)) {
//根据加盟商用户ID查询面试官ID
HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
hyPartnerInterviewPlanDO.setPartnerId(partnerId);
List<HyPartnerInterviewPlanDO> hyPartnerInterviewPlanDOS = hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO);
//如果查询结果为空，返回错误信息
//如果查询结果为空，则去线索中获取招商经理，面试官只有两个阶段，一个是在第一次申请时不存在面试安排直接取招商经理，第二个时面试信息中可修改面试官信息，这个时候以面试信息中为准
if (CollectionUtils.isEmpty(hyPartnerInterviewPlanDOS)) {
throw new ServiceException(ErrorCodeEnum.INTERVIEW_PLAN_IS_NULL);
}
HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(lineId));
interviewerId = hyPartnerLineInfoDO.getInvestmentManager();
}else {
interviewerId = hyPartnerInterviewPlanDOS.get(0).getInterviewer();
}
}
long startTime = 0L;
long endTime = 0L;
DateTime startDateTime = null;

16
coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.cool.store.constants.CommonConstants;
import com.cool.store.constants.RedisConstant;
import com.cool.store.dao.*;
import com.cool.store.dto.buser.UserPositionAndUserScopeDTO;
import com.cool.store.dto.partner.*;
import com.cool.store.entity.EnterpriseUserDO;
import com.cool.store.entity.HyOpenAreaInfoDO;
@@ -16,6 +17,7 @@ import com.cool.store.exception.ServiceException;
import com.cool.store.request.CloseFollowRequest;
import com.cool.store.request.LineRequest;
import com.cool.store.request.PrivateSeaLineListRequest;
import com.cool.store.service.EnterpriseUserService;
import com.cool.store.service.HyPartnerLineInfoService;
import com.cool.store.utils.CoolDateUtils;
import com.cool.store.utils.RedisUtilPool;
@@ -54,6 +56,8 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
private RedisUtilPool redisUtilPool;
@Resource
HyOpenAreaInfoDAO hyOpenAreaInfoDAO;
@Resource
EnterpriseUserService enterpriseUserService;
@Override
public StageCountVO selectStagePendingCount(String userId) {
@@ -301,13 +305,16 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
return publicSeaLineList;
}
@Override
public PageInfo<PrivateSeaLineListVo> privateSeaLineList(String userId, PrivateSeaLineListRequest request) {
// TODO: 2023/6/19 su userlist计算
UserPositionAndUserScopeDTO userIdsByScope = enterpriseUserService.getUserIdsByScope(userId);
PageHelper.startPage(request.getPageNum(),request.getPageSize());
PageInfo privateLineList = new PageInfo(hyPartnerLineInfoDAO.getPrivateSeaLineList(request.getKeyword(), request.getKeywordType(), request.getWorkflowStage(),
request.getWorkflowStatus(), request.getDeadlineStart(), request.getDeadlineEnd(),
request.getIntentArea(), request.getAcceptAdjustType(), request.getStoreKeyword(), request.getStoreKeywordType(), null));
request.getIntentArea(), request.getAcceptAdjustType(), request.getStoreKeyword(),
request.getStoreKeywordType(), userIdsByScope.getInvestmentUserIds(),userIdsByScope.getDevelopmentUserIds()));
List<PrivateSeaLineDTO> list = privateLineList.getList();
if (CollectionUtils.isEmpty(list)){
return new PageInfo<>();
@@ -389,10 +396,11 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
}
HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
if (AreaStatusEnum.OPEN.equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.KEY_OPEN.equals(hyOpenAreaInfoDO.getAreaStatus())){
if (AreaStatusEnum.OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.KEY_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){
return Boolean.TRUE;
}
if (AreaStatusEnum.NOT_OPEN.equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.SATURATED.equals(hyOpenAreaInfoDO.getAreaStatus())){
if (AreaStatusEnum.NOT_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.SATURATED.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){
if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){
return Boolean.FALSE;
}

13
coolstore-partner-service/src/main/java/com/cool/store/service/impl/InterviewServiceImpl.java
View File

@@ -207,6 +207,7 @@ public class InterviewServiceImpl implements InterviewService {
}
@Override
@Transactional
public CreateAppointmentVO createAppointment(CreateAppointmentReq request) {
CreateAppointmentVO vo = new CreateAppointmentVO();
//1.创建面试计划
@@ -226,14 +227,18 @@ public class InterviewServiceImpl implements InterviewService {
record.setRoomId(StringUtil.generateRoomId(startBookingTime));
record.setRoomStatus(RoomStatus.WAIT_FOR_OPEN.getCode());
record.setDeleted(false);
long interviewPlanId = hyPartnerInterviewPlanMapper.insertSelective(record);
vo.setInterviewPlanId(String.valueOf(interviewPlanId));
hyPartnerInterviewPlanMapper.insertSelective(record);
HyPartnerInterviewPlanDO hyPartnerInterviewPlanDO = new HyPartnerInterviewPlanDO();
hyPartnerInterviewPlanMapper.selectBySelective(hyPartnerInterviewPlanDO);
// vo.setInterviewPlanId(String.valueOf(interviewPlanId));
//2.创建面试信息
HyPartnerInterviewDO hyPartnerInterviewDO = new HyPartnerInterviewDO();
hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId);
hyPartnerInterviewDO.setPartnerId(request.getPartnerId());
// hyPartnerInterviewDO.setInterviewPlanId(interviewPlanId);
hyPartnerInterviewDO.setPartnerLineId(request.getPartnerLineId());
hyPartnerInterviewDO.setPartnerId(request.getPartnerId());
hyPartnerInterviewDO.setInterviewer(request.getInterviewerId());
hyPartnerInterviewDO.setCreateTime(new Date());
hyPartnerInterviewDO.setUpdateTime(new Date());

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

@@ -38,7 +38,7 @@ public class OpenAreaServiceImpl implements OpenAreaService {
Map<Long, HyOpenAreaInfoDO> longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x));
//查询关键字下所有的数据 原始的数据
List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,areaStatus,flag);
List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,null,areaStatus,flag);
Set<Long> longSet = hyOpenAreaInfoDOS.stream().map(HyOpenAreaInfoDO::getId).collect(Collectors.toSet());
List<HyOpenAreaInfoDO> result = new ArrayList<>();
@@ -60,13 +60,13 @@ public class OpenAreaServiceImpl implements OpenAreaService {
}
@Override
public List<OpenAreaTreeVO> queryAllOpenAreaByKeyword(String keyword, Boolean flag) {
public List<OpenAreaTreeVO> queryAllOpenAreaByKeyword(String keyword,Boolean applyFlag, Boolean flag) {
//先查出所有的一级菜单
List<HyOpenAreaInfoDO> openArea = hyOpenAreaInfoDAO.queryFirstLevel();
Map<Long, HyOpenAreaInfoDO> longHyOpenAreaInfoDOMap = openArea.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x));
//查询关键字下所有的数据 原始的数据
List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,null,flag);
List<HyOpenAreaInfoDO> hyOpenAreaInfoDOS = hyOpenAreaInfoDAO.queryByKeyword(keyword,applyFlag,null,flag);
Map<Long, HyOpenAreaInfoDO> hyMap = hyOpenAreaInfoDOS.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, x -> x));

3
coolstore-partner-webb/src/main/java/com/cool/store/controller/DeskController.java
View File

@@ -213,8 +213,7 @@ public class DeskController {
@PostMapping(path = "/queryPrivateSeaLineList")
@ApiOperation("私海列表")
public ResponseResult<PageInfo<PrivateSeaLineListVo>> queryPrivateSeqLineList(@RequestBody PrivateSeaLineListRequest privateSeaLineListRequest){
return ResponseResult.success();
return ResponseResult.success(hyPartnerLineInfoService.privateSeaLineList(CurrentUserHolder.getUserId(),privateSeaLineListRequest));
}
@PostMapping(path = "/queryBlackList")

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

@@ -43,7 +43,7 @@ public class OpenAreaController {
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false)
})
public ResponseResult<List<OpenAreaTreeVO>> getAllOpenAreaTree(@RequestParam(value = "keyword",required = false)String keyword){
return ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,Boolean.FALSE));
return ResponseResult.success(openAreaService.queryAllOpenAreaByKeyword(keyword,null,Boolean.FALSE));
}

6
coolstore-partner-webc/src/main/java/com/cool/store/controller/OpenAreaController.java
View File

@@ -49,9 +49,11 @@ public class OpenAreaController {
@ApiOperation("区域申请搜索 树形结构")
@ApiImplicitParams({
@ApiImplicitParam(name = "keyword", value = "搜索关键字", required = false),
@ApiImplicitParam(name = "applyFlag", value = "可申请标识", required = false)
})
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword){
List<OpenAreaTreeVO> openAreaTreeVOS = openAreaService.queryAllOpenAreaByKeyword(keyword,Boolean.FALSE);
public ResponseResult<List<OpenAreaTreeVO>> getOpenAreaList(@RequestParam(value = "keyword",required = false)String keyword,
@RequestParam(value = "applyFlag",required = false)Boolean applyFlag){
List<OpenAreaTreeVO> openAreaTreeVOS = openAreaService.queryAllOpenAreaByKeyword(keyword,applyFlag,Boolean.FALSE);
return ResponseResult.success(openAreaTreeVOS);
}