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

铺位提交审核做检验

Browse Source
This commit is contained in:
shuo.wang
2025-03-31 15:50:34 +08:00
parent 9b8b9bdba2
commit aa98da8017
1 changed files with 156 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

311
coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java
View File

@@ -102,7 +102,6 @@ public class PointServiceImpl implements PointService {
pointInfo.setPointCode(generateCode()); pointInfo.setPointCode(generateCode());
pointInfo.setDevelopmentManager(userId); pointInfo.setDevelopmentManager(userId);
pointInfo.setDevelopmentTime(new Date()); pointInfo.setDevelopmentTime(new Date());
pointInfo.setPointStatus(PointStatusEnum.POINT_STATUS_2.getCode());
Long pointId = pointInfoDAO.addPointInfo(pointInfo); Long pointId = pointInfoDAO.addPointInfo(pointInfo);
PointDetailInfoDO shopPoint = AddPointDetailRequest.convertDO(shopPointDetailRequest); PointDetailInfoDO shopPoint = AddPointDetailRequest.convertDO(shopPointDetailRequest);
shopPoint.setPointId(pointId); shopPoint.setPointId(pointId);
@@ -113,12 +112,12 @@ public class PointServiceImpl implements PointService {
@Override @Override
public PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo) { public PointDetailVO getPointDetailInfo(Long pointId, Boolean isGetNodeNo) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId); PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId);
if(Objects.isNull(pointDetailInfo)){ if (Objects.isNull(pointDetailInfo)) {
log.error("铺位详情信息不存在"); log.error("铺位详情信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
@@ -127,10 +126,10 @@ public class PointServiceImpl implements PointService {
result.setDevelopmentManagerUserName(userName); result.setDevelopmentManagerUserName(userName);
result.setDevelopmentManagerUserId(pointInfo.getDevelopmentManager()); result.setDevelopmentManagerUserId(pointInfo.getDevelopmentManager());
result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId())); result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId()));
if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){ if (Objects.nonNull(isGetNodeNo) && isGetNodeNo) {
result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId)); result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId));
} }
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
List<Long> canSubmitRentContractShopIds = shopStageInfoDAO.getCanSubmitRentContractShopIds(Arrays.asList(pointInfo.getShopId())); List<Long> canSubmitRentContractShopIds = shopStageInfoDAO.getCanSubmitRentContractShopIds(Arrays.asList(pointInfo.getShopId()));
boolean canSubmitRentContract = CollectionUtils.isEmpty(canSubmitRentContractShopIds) ? Boolean.FALSE : Boolean.TRUE; boolean canSubmitRentContract = CollectionUtils.isEmpty(canSubmitRentContractShopIds) ? Boolean.FALSE : Boolean.TRUE;
result.setCanSubmitRentContract(canSubmitRentContract); result.setCanSubmitRentContract(canSubmitRentContract);
@@ -142,7 +141,7 @@ public class PointServiceImpl implements PointService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest) { public Long updatePointDetailInfo(UpdatePointDetailRequest shopPointDetailRequest) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopPointDetailRequest.getPointId()); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopPointDetailRequest.getPointId());
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
@@ -158,10 +157,10 @@ public class PointServiceImpl implements PointService {
public Integer generateEvaluationReport(Long pointId) { public Integer generateEvaluationReport(Long pointId) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId); PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId);
if(Objects.isNull(pointInfo) || Objects.isNull(pointDetailInfo)){ if (Objects.isNull(pointInfo) || Objects.isNull(pointDetailInfo)) {
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(!pointDetailInfo.isCanSubmitEvaluable() || StringUtils.isBlank(pointInfo.getPointArea())){ if (!pointDetailInfo.isCanSubmitEvaluable() || StringUtils.isBlank(pointInfo.getPointArea())) {
throw new ServiceException(ErrorCodeEnum.POINT_NOT_COMPLETE); throw new ServiceException(ErrorCodeEnum.POINT_NOT_COMPLETE);
} }
Integer totalPointScore = pointDetailInfo.getTotalPointScore(); Integer totalPointScore = pointDetailInfo.getTotalPointScore();
@@ -177,18 +176,18 @@ public class PointServiceImpl implements PointService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer pointInvalid(Long pointId) { public Integer pointInvalid(Long pointId) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ if (PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())) {
throw new ServiceException(ErrorCodeEnum.POINT_SIGNED); throw new ServiceException(ErrorCodeEnum.POINT_SIGNED);
} }
PointInfoDO updatePoint = new PointInfoDO(); PointInfoDO updatePoint = new PointInfoDO();
updatePoint.setId(pointId); updatePoint.setId(pointId);
updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_7.getCode()); updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_7.getCode());
pointInfoDAO.updatePointInfo(updatePoint); pointInfoDAO.updatePointInfo(updatePoint);
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId());
} }
return pointRecommendDAO.updateRecommendStatus(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6, null); return pointRecommendDAO.updateRecommendStatus(pointId, PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6, null);
@@ -198,7 +197,7 @@ public class PointServiceImpl implements PointService {
* 回退选址状态 * 回退选址状态
* @return * @return
*/ */
private void rollbackSelectPoint(Long shopId, Long pointId){ private void rollbackSelectPoint(Long shopId, Long pointId) {
//店铺回退待带选址 //店铺回退待带选址
shopInfoDAO.unbindPoint(shopId); shopInfoDAO.unbindPoint(shopId);
//铺位回退 //铺位回退
@@ -207,7 +206,7 @@ public class PointServiceImpl implements PointService {
shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10); shopStageInfoDAO.updateShopStageInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_10);
//租赁合同回到未开始 //租赁合同回到未开始
Integer result = shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_2); Integer result = shopStageInfoDAO.updateShopStageToNotStarted(shopId, ShopSubStageEnum.SHOP_STAGE_2);
if(result > CommonConstants.ZERO){ if (result > CommonConstants.ZERO) {
//删除租赁合同 //删除租赁合同
shopRentInfoDAO.deleteRentContractByShopId(shopId); shopRentInfoDAO.deleteRentContractByShopId(shopId);
} }
@@ -217,14 +216,14 @@ public class PointServiceImpl implements PointService {
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer pointUnbind(Long pointId) { public Integer pointUnbind(Long pointId) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ if (PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())) {
throw new ServiceException(ErrorCodeEnum.POINT_SIGNED); throw new ServiceException(ErrorCodeEnum.POINT_SIGNED);
} }
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId()); rollbackSelectPoint(pointInfo.getShopId(), pointInfo.getId());
} }
//将已选择、已被他人选择的状态更新成待选泽 //将已选择、已被他人选择的状态更新成待选泽
@@ -234,7 +233,7 @@ public class PointServiceImpl implements PointService {
@Override @Override
public Integer addMapEvaluationReport(AddMapEvaluationReportRequest request) { public Integer addMapEvaluationReport(AddMapEvaluationReportRequest request) {
PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(request.getPointId()); PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(request.getPointId());
if(Objects.isNull(pointDetailInfo)){ if (Objects.isNull(pointDetailInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
@@ -250,25 +249,26 @@ public class PointServiceImpl implements PointService {
Long pointId = request.getPointId(); Long pointId = request.getPointId();
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.error("铺位基本信息不存在"); log.error("铺位基本信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(!pointInfo.getPointStatus().equals(PointStatusEnum.POINT_STATUS_2.getCode())){ if (!pointInfo.getPointStatus().equals(PointStatusEnum.POINT_STATUS_2.getCode())
&& !pointInfo.getPointStatus().equals(PointStatusEnum.POINT_STATUS_1.getCode())) {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
} }
PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId); PointDetailInfoDO pointDetailInfo = pointDetailInfoDAO.getPointDetailInfoByPointId(pointId);
if(Objects.isNull(pointDetailInfo)){ if (Objects.isNull(pointDetailInfo)) {
log.error("铺位详细信息不存在"); log.error("铺位详细信息不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
//处理子任务审核记录表 //处理子任务审核记录表
AuditSettingVO auditSetting = getAuditSetting(); AuditSettingVO auditSetting = getAuditSetting();
if(Objects.isNull(auditSetting)){ if (Objects.isNull(auditSetting)) {
throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING); throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NOT_SETTING);
} }
List<AuditNodeDTO> auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager()); List<AuditNodeDTO> auditNode = dealAuditNode(auditSetting, pointInfo.getRegionId(), pointInfo.getDevelopmentManager());
if(auditNode.size()==CommonConstants.ONE){ if (auditNode.size() == CommonConstants.ONE) {
throw new ServiceException(ErrorCodeEnum.CONFIRM_THE_APPROVER); throw new ServiceException(ErrorCodeEnum.CONFIRM_THE_APPROVER);
} }
int submitAuditCount = pointInfo.getSubmitAuditCount() + 1; int submitAuditCount = pointInfo.getSubmitAuditCount() + 1;
@@ -301,7 +301,7 @@ public class PointServiceImpl implements PointService {
public AuditSettingVO getAuditSetting() { public AuditSettingVO getAuditSetting() {
String cacheKey = MessageFormat.format(AUDIT_SETTING_KEY, enterpriseId); String cacheKey = MessageFormat.format(AUDIT_SETTING_KEY, enterpriseId);
String auditSetting = redisUtilPool.getString(cacheKey); String auditSetting = redisUtilPool.getString(cacheKey);
if(StringUtils.isBlank(auditSetting)){ if (StringUtils.isBlank(auditSetting)) {
return null; return null;
} }
return JSONObject.parseObject(auditSetting, AuditSettingVO.class); return JSONObject.parseObject(auditSetting, AuditSettingVO.class);
@@ -341,25 +341,25 @@ public class PointServiceImpl implements PointService {
* @param currentNo * @param currentNo
* @return * @return
*/ */
private Integer dealNextAuditRecord(PointInfoDO pointInfo, Map<Integer, PointAuditRecordDO> pointAuditRecordMap, Integer currentNo){ private Integer dealNextAuditRecord(PointInfoDO pointInfo, Map<Integer, PointAuditRecordDO> pointAuditRecordMap, Integer currentNo) {
Integer result = CommonConstants.ZERO; Integer result = CommonConstants.ZERO;
PointAuditRecordDO nextAuditRecord = getNextAuditRecord(currentNo, pointAuditRecordMap); PointAuditRecordDO nextAuditRecord = getNextAuditRecord(currentNo, pointAuditRecordMap);
if(Objects.nonNull(nextAuditRecord)){ if (Objects.nonNull(nextAuditRecord)) {
pointAuditRecordDAO.updatePointAuditRecord(PointAuditRecordDO.convert(nextAuditRecord.getId(), new Date())); pointAuditRecordDAO.updatePointAuditRecord(PointAuditRecordDO.convert(nextAuditRecord.getId(), new Date()));
//审批通过的情况下 生成下一个节点的待办数据 //审批通过的情况下 生成下一个节点的待办数据
pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord)); pointTodoInfoDAO.addPointTodoInfo(PointAuditRecordDO.convertTODO(nextAuditRecord));
List<String> sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class); List<String> sendMessageUserIds = JSONObject.parseArray(nextAuditRecord.getHandlerUserIds(), String.class);
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("pointName",pointInfo.getPointName()) ; map.put("pointName", pointInfo.getPointName());
map.put("pointAddress",pointInfo.getAddress()) ; map.put("pointAddress", pointInfo.getAddress());
commonService.sendQWMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, map); commonService.sendQWMessage(sendMessageUserIds, MessageEnum.MESSAGE_13, map);
}else{ } else {
PointInfoDO updatePoint = new PointInfoDO(); PointInfoDO updatePoint = new PointInfoDO();
updatePoint.setId(pointInfo.getId()); updatePoint.setId(pointInfo.getId());
//没有下一节点 审批通过 //没有下一节点 审批通过
updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode()); updatePoint.setPointStatus(PointStatusEnum.POINT_STATUS_5.getCode());
updatePoint.setStorageStatus(StorageStatusEnum.IN_STORAGE.getCode()); updatePoint.setStorageStatus(StorageStatusEnum.IN_STORAGE.getCode());
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
initUploadRentContract(pointInfo); initUploadRentContract(pointInfo);
} }
Map<String, String> messageMap = new HashMap<>(); Map<String, String> messageMap = new HashMap<>();
@@ -378,7 +378,7 @@ public class PointServiceImpl implements PointService {
* @param reason * @param reason
* @return * @return
*/ */
private Integer auditRejectDeal(PointInfoDO pointInfo, String reason){ private Integer auditRejectDeal(PointInfoDO pointInfo, String reason) {
Long pointId = pointInfo.getId(); Long pointId = pointInfo.getId();
PointInfoDO pointInfoUpdate = new PointInfoDO(); PointInfoDO pointInfoUpdate = new PointInfoDO();
pointInfoUpdate.setId(pointId); pointInfoUpdate.setId(pointId);
@@ -398,17 +398,17 @@ public class PointServiceImpl implements PointService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer audit(String userId, PointAuditRequest request) { public Integer audit(String userId, PointAuditRequest request) {
if(!request.check()){ if (!request.check()) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
Long pointId = request.getPointId(); Long pointId = request.getPointId();
PointTodoInfoDO pointTodo = pointTodoInfoDAO.getPointToDoByUserIdAndPointId(userId, pointId); PointTodoInfoDO pointTodo = pointTodoInfoDAO.getPointToDoByUserIdAndPointId(userId, pointId);
if(Objects.isNull(pointTodo)){ if (Objects.isNull(pointTodo)) {
log.info("该用户没有待办数据"); log.info("该用户没有待办数据");
throw new ServiceException(ErrorCodeEnum.USER_NOT_TODO_AUDIT); throw new ServiceException(ErrorCodeEnum.USER_NOT_TODO_AUDIT);
} }
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
log.info("铺位不存在"); log.info("铺位不存在");
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
@@ -417,14 +417,14 @@ public class PointServiceImpl implements PointService {
pointTodoInfoDAO.updatePointTodoInfo(pointId, pointTodo.getNodeNo(), pointInfo.getSubmitAuditCount(), userId); pointTodoInfoDAO.updatePointTodoInfo(pointId, pointTodo.getNodeNo(), pointInfo.getSubmitAuditCount(), userId);
Map<Integer, PointAuditRecordDO> pointAuditRecordMap = pointAuditRecordDAO.getPointAuditRecordMap(pointId, pointInfo.getSubmitAuditCount()); Map<Integer, PointAuditRecordDO> pointAuditRecordMap = pointAuditRecordDAO.getPointAuditRecordMap(pointId, pointInfo.getSubmitAuditCount());
PointAuditRecordDO pointAuditRecord = pointAuditRecordMap.get(pointTodo.getNodeNo()); PointAuditRecordDO pointAuditRecord = pointAuditRecordMap.get(pointTodo.getNodeNo());
if(Objects.isNull(pointAuditRecord)){ if (Objects.isNull(pointAuditRecord)) {
log.info("铺位处理记录中的数据不对"); log.info("铺位处理记录中的数据不对");
throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NODE_ERROR); throw new ServiceException(ErrorCodeEnum.POINT_AUDIT_NODE_ERROR);
} }
NodeNoEnum nodeNoEnum = NodeNoEnum.getByCode(pointTodo.getNodeNo()); NodeNoEnum nodeNoEnum = NodeNoEnum.getByCode(pointTodo.getNodeNo());
PointAuditRecordDO auditRecord = PointAuditRecordDO.convert(pointAuditRecord.getId(), userId, auditStatus, request.getReason(), nodeNoEnum); PointAuditRecordDO auditRecord = PointAuditRecordDO.convert(pointAuditRecord.getId(), userId, auditStatus, request.getReason(), nodeNoEnum);
pointAuditRecordDAO.updatePointAuditRecord(auditRecord); pointAuditRecordDAO.updatePointAuditRecord(auditRecord);
if(AuditStatusEnum.REJECT.equals(auditStatus)){ if (AuditStatusEnum.REJECT.equals(auditStatus)) {
return auditRejectDeal(pointInfo, request.getReason()); return auditRejectDeal(pointInfo, request.getReason());
} }
//处理下一节点任务及更新point状态 //处理下一节点任务及更新point状态
@@ -434,13 +434,13 @@ public class PointServiceImpl implements PointService {
@Override @Override
public Integer turnDevelopmentManager(TurnDevelopmentManagerRequest request) { public Integer turnDevelopmentManager(TurnDevelopmentManagerRequest request) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(request.getPointId()); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(request.getPointId());
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus()) || PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus()) || PointStatusEnum.POINT_STATUS_6.getCode().equals(pointInfo.getPointStatus())) {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
} }
if(PointStatusEnum.POINT_STATUS_7.getCode().equals(pointInfo.getPointStatus())){ if (PointStatusEnum.POINT_STATUS_7.getCode().equals(pointInfo.getPointStatus())) {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
} }
pointInfo.setDevelopmentManager(request.getDevelopmentManager()); pointInfo.setDevelopmentManager(request.getDevelopmentManager());
@@ -450,8 +450,8 @@ public class PointServiceImpl implements PointService {
@Override @Override
public PageInfo<LinePointBaseInfoVO> getLinePage(PointLinePageRequest request) { public PageInfo<LinePointBaseInfoVO> getLinePage(PointLinePageRequest request) {
Page<LineInfoDO> lineList = lineInfoDAO.getLinePageByDevelopmentManager(request); Page<LineInfoDO> lineList = lineInfoDAO.getLinePageByDevelopmentManager(request);
List<String> userPortraitList = lineList.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(LineInfoDO::getUserPortrait).collect(Collectors.toList()); List<String> userPortraitList = lineList.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait())).map(LineInfoDO::getUserPortrait).collect(Collectors.toList());
List<String> investmentManagerUserIds = lineList.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(LineInfoDO::getInvestmentManager).collect(Collectors.toList()); List<String> investmentManagerUserIds = lineList.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager())).map(LineInfoDO::getInvestmentManager).collect(Collectors.toList());
List<Long> lineIds = lineList.stream().map(LineInfoDO::getId).collect(Collectors.toList()); List<Long> lineIds = lineList.stream().map(LineInfoDO::getId).collect(Collectors.toList());
List<Long> wantShopAreaIds = lineList.stream().map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIds = lineList.stream().map(LineInfoDO::getWantShopAreaId).collect(Collectors.toList());
Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(lineIds); Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(lineIds);
@@ -468,8 +468,8 @@ public class PointServiceImpl implements PointService {
@Override @Override
public PageInfo<ShopPointBaseInfoVO> getShopPage(PointLinePageRequest request) { public PageInfo<ShopPointBaseInfoVO> getShopPage(PointLinePageRequest request) {
List<ShopPointDTO> listByDevelopmentManager = shopInfoDAO.getShopPointListByDevelopmentManager(request); List<ShopPointDTO> listByDevelopmentManager = shopInfoDAO.getShopPointListByDevelopmentManager(request);
List<String> userPortraitList = listByDevelopmentManager.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait() )).map(ShopPointDTO::getUserPortrait).collect(Collectors.toList()); List<String> userPortraitList = listByDevelopmentManager.stream().filter(x -> StringUtils.isNotEmpty(x.getUserPortrait())).map(ShopPointDTO::getUserPortrait).collect(Collectors.toList());
List<String> investmentManagerUserIds = listByDevelopmentManager.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager() )).map(ShopPointDTO::getInvestmentManager).collect(Collectors.toList()); List<String> investmentManagerUserIds = listByDevelopmentManager.stream().filter(x -> StringUtils.isNotEmpty(x.getInvestmentManager())).map(ShopPointDTO::getInvestmentManager).collect(Collectors.toList());
List<Long> shopIds = listByDevelopmentManager.stream().map(ShopPointDTO::getShopId).collect(Collectors.toList()); List<Long> shopIds = listByDevelopmentManager.stream().map(ShopPointDTO::getShopId).collect(Collectors.toList());
List<Long> wantShopAreaIds = listByDevelopmentManager.stream().map(ShopPointDTO::getWantShopAreaId).collect(Collectors.toList()); List<Long> wantShopAreaIds = listByDevelopmentManager.stream().map(ShopPointDTO::getWantShopAreaId).collect(Collectors.toList());
Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getShopPushPointNumMap(shopIds); Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getShopPushPointNumMap(shopIds);
@@ -480,7 +480,7 @@ public class PointServiceImpl implements PointService {
List<Long> lineIds = listByDevelopmentManager.stream().map(ShopPointDTO::getLineId).collect(Collectors.toList()); List<Long> lineIds = listByDevelopmentManager.stream().map(ShopPointDTO::getLineId).collect(Collectors.toList());
Map<Long, String> partnerNameMap = lineInfoDAO.getUserNameMap(lineIds); Map<Long, String> partnerNameMap = lineInfoDAO.getUserNameMap(lineIds);
List<ShopPointBaseInfoVO> resultList = ShopPointBaseInfoVO.convertList(partnerNameMap,listByDevelopmentManager, userNameMap, userPortraitMap, cityMap, recommendShopNumMap); List<ShopPointBaseInfoVO> resultList = ShopPointBaseInfoVO.convertList(partnerNameMap, listByDevelopmentManager, userNameMap, userPortraitMap, cityMap, recommendShopNumMap);
PageInfo resultPage = new PageInfo(listByDevelopmentManager); PageInfo resultPage = new PageInfo(listByDevelopmentManager);
resultPage.setList(resultList); resultPage.setList(resultList);
return resultPage; return resultPage;
@@ -492,7 +492,7 @@ public class PointServiceImpl implements PointService {
* @return * @return
*/ */
@Override @Override
public LinePointBaseInfoVO getLineInfo(Long lineId){ public LinePointBaseInfoVO getLineInfo(Long lineId) {
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(Arrays.asList(lineId)); Map<Long, Integer> recommendShopNumMap = pointRecommendDAO.getPushShopNumMap(Arrays.asList(lineId));
HyOpenAreaInfoDO cityArea = hyOpenAreaInfoDAO.selectById(lineInfo.getWantShopAreaId()); HyOpenAreaInfoDO cityArea = hyOpenAreaInfoDAO.selectById(lineInfo.getWantShopAreaId());
@@ -509,16 +509,16 @@ public class PointServiceImpl implements PointService {
@Override @Override
public PageInfo<PointPageVO> getMyPointPage(PointPageRequest request) { public PageInfo<PointPageVO> getMyPointPage(PointPageRequest request) {
if(CollectionUtils.isNotEmpty(request.getRegionIds())){ if (CollectionUtils.isNotEmpty(request.getRegionIds())) {
if(request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)){ if (request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
request.setRegionIds(null); request.setRegionIds(null);
}else{ } else {
request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds())); request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds()));
} }
} }
List<PointPageVO> resultList = new ArrayList(); List<PointPageVO> resultList = new ArrayList();
Page<PointInfoDO> pointPage = pointInfoDAO.getMyPointPage(request); Page<PointInfoDO> pointPage = pointInfoDAO.getMyPointPage(request);
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
@@ -531,23 +531,23 @@ public class PointServiceImpl implements PointService {
} }
@Override @Override
public PageInfo<PointPageVO> getTeamPointPage(AllPointPageRequest request){ public PageInfo<PointPageVO> getTeamPointPage(AllPointPageRequest request) {
if(!sysRoleService.checkIsAdmin(request.getCurUserId())){ if (!sysRoleService.checkIsAdmin(request.getCurUserId())) {
request.setAuthRegionIds(userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(request.getCurUserId())); request.setAuthRegionIds(userAuthMappingService.getAuthRegionIdAndSubRegionIdByUserId(request.getCurUserId()));
} }
if(CollectionUtils.isNotEmpty(request.getRegionIds())){ if (CollectionUtils.isNotEmpty(request.getRegionIds())) {
if(request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)){ if (request.getRegionIds().contains(CommonConstants.ROOT_DEPT_ID_STR)) {
request.setRegionIds(null); request.setRegionIds(null);
}else{ } else {
request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds())); request.setRegionIds(regionService.getSubRegionIdsByRegionIds(request.getRegionIds()));
} }
} }
if(Objects.nonNull(request.getPointStatus()) && PointStatusEnum.POINT_STATUS_3.getCode().equals(request.getPointStatus())){ if (Objects.nonNull(request.getPointStatus()) && PointStatusEnum.POINT_STATUS_3.getCode().equals(request.getPointStatus())) {
request.setPointStatus(PointStatusEnum.POINT_STATUS_4.getCode()); request.setPointStatus(PointStatusEnum.POINT_STATUS_4.getCode());
} }
List<PointPageVO> resultList = new ArrayList(); List<PointPageVO> resultList = new ArrayList();
Page<PointInfoDO> pointPage = pointInfoDAO.getTeamPointPage(request); Page<PointInfoDO> pointPage = pointInfoDAO.getTeamPointPage(request);
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
@@ -562,10 +562,10 @@ public class PointServiceImpl implements PointService {
@Override @Override
public List<PointAuditRecordVO> getPointAllAuditRecord(Long pointId) { public List<PointAuditRecordVO> getPointAllAuditRecord(Long pointId) {
List<PointAuditRecordDO> auditRecordList = pointAuditRecordDAO.getPointAllAuditRecord(pointId); List<PointAuditRecordDO> auditRecordList = pointAuditRecordDAO.getPointAllAuditRecord(pointId);
if(CollectionUtils.isEmpty(auditRecordList)){ if (CollectionUtils.isEmpty(auditRecordList)) {
return Lists.newArrayList(); return Lists.newArrayList();
} }
List<String> userIds = auditRecordList.stream().map(o->JSONObject.parseArray(o.getHandlerUserIds(), String.class)).flatMap(Collection::stream).distinct().collect(Collectors.toList()); List<String> userIds = auditRecordList.stream().map(o -> JSONObject.parseArray(o.getHandlerUserIds(), String.class)).flatMap(Collection::stream).distinct().collect(Collectors.toList());
Map<String, EnterpriseUserDO> userMap = enterpriseUserDAO.getUserInfoMap(userIds); Map<String, EnterpriseUserDO> userMap = enterpriseUserDAO.getUserInfoMap(userIds);
return PointAuditRecordVO.convert(auditRecordList, userMap); return PointAuditRecordVO.convert(auditRecordList, userMap);
} }
@@ -602,7 +602,7 @@ public class PointServiceImpl implements PointService {
public PageInfo<PointPageVO> getRecommendPointList(RecommendPointPageRequest request) { public PageInfo<PointPageVO> getRecommendPointList(RecommendPointPageRequest request) {
List<PointPageVO> resultList = new ArrayList(); List<PointPageVO> resultList = new ArrayList();
Page<PointInfoDO> pointPage = pointInfoDAO.getRecommendPointList(request); Page<PointInfoDO> pointPage = pointInfoDAO.getRecommendPointList(request);
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
@@ -619,26 +619,26 @@ public class PointServiceImpl implements PointService {
List<Long> pointIds = request.getPointIds(); List<Long> pointIds = request.getPointIds();
List<PointInfoDO> pointList = pointInfoDAO.getPointListByIds(pointIds); List<PointInfoDO> pointList = pointInfoDAO.getPointListByIds(pointIds);
List<PointInfoDO> selectList = pointList.stream().filter(o -> SelectStatusEnum.SELECT_STATUS_1.getCode().equals(o.getSelectStatus())).collect(Collectors.toList()); List<PointInfoDO> selectList = pointList.stream().filter(o -> SelectStatusEnum.SELECT_STATUS_1.getCode().equals(o.getSelectStatus())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(selectList)){ if (CollectionUtils.isNotEmpty(selectList)) {
String pointNames = selectList.stream().map(PointInfoDO::getPointName).collect(Collectors.joining(",")); String pointNames = selectList.stream().map(PointInfoDO::getPointName).collect(Collectors.joining(","));
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, pointNames + "，已经被选"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, pointNames + "，已经被选");
} }
List<PointInfoDO> invalidList = pointList.stream().filter(o -> PointStatusEnum.POINT_STATUS_7.getCode().equals(o.getPointStatus())).collect(Collectors.toList()); List<PointInfoDO> invalidList = pointList.stream().filter(o -> PointStatusEnum.POINT_STATUS_7.getCode().equals(o.getPointStatus())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(invalidList)){ if (CollectionUtils.isNotEmpty(invalidList)) {
String pointNames = invalidList.stream().map(PointInfoDO::getPointName).collect(Collectors.joining(",")); String pointNames = invalidList.stream().map(PointInfoDO::getPointName).collect(Collectors.joining(","));
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, pointNames + "，已失效"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, pointNames + "，已失效");
} }
List<PointRecommendDO> recommendPointList = pointRecommendDAO.getShopRecommendPointList(request.getShopId()); List<PointRecommendDO> recommendPointList = pointRecommendDAO.getShopRecommendPointList(request.getShopId());
if(CollectionUtils.isNotEmpty(recommendPointList)){ if (CollectionUtils.isNotEmpty(recommendPointList)) {
List<PointRecommendDO> recommendList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(o.getStatus()) || List<PointRecommendDO> recommendList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(o.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(o.getStatus()) || PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(o.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_4.getCode().equals(o.getStatus())) PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_4.getCode().equals(o.getStatus()))
.filter(o->request.getPointIds().contains(o.getPointId())).collect(Collectors.toList()); .filter(o -> request.getPointIds().contains(o.getPointId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(recommendList)){ if (CollectionUtils.isNotEmpty(recommendList)) {
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "铺位已推送，请勿重复推送"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "铺位已推送，请勿重复推送");
} }
List<PointRecommendDO> selectedList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(o.getStatus())).filter(o->request.getPointIds().contains(o.getPointId())).collect(Collectors.toList()); List<PointRecommendDO> selectedList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(o.getStatus())).filter(o -> request.getPointIds().contains(o.getPointId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(selectedList)){ if (CollectionUtils.isNotEmpty(selectedList)) {
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "铺位已选，请勿重复推送"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "铺位已选，请勿重复推送");
} }
} }
@@ -650,31 +650,31 @@ public class PointServiceImpl implements PointService {
public Integer pointRecommendLine(PointRecommendLineRequest request) { public Integer pointRecommendLine(PointRecommendLineRequest request) {
Long pointId = request.getPointId(); Long pointId = request.getPointId();
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(PointStatusEnum.POINT_STATUS_7.getCode().equals(pointInfo.getPointStatus())){ if (PointStatusEnum.POINT_STATUS_7.getCode().equals(pointInfo.getPointStatus())) {
throw new ServiceException(ErrorCodeEnum.POINT_IS_INVALID); throw new ServiceException(ErrorCodeEnum.POINT_IS_INVALID);
} }
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
throw new ServiceException(ErrorCodeEnum.POINT_SELECTED); throw new ServiceException(ErrorCodeEnum.POINT_SELECTED);
} }
List<PointRecommendDO> recommendPointList = pointRecommendDAO.getRecommendPointListByPointId(pointId); List<PointRecommendDO> recommendPointList = pointRecommendDAO.getRecommendPointListByPointId(pointId);
if(CollectionUtils.isNotEmpty(recommendPointList)){ if (CollectionUtils.isNotEmpty(recommendPointList)) {
List<PointRecommendDO> recommendList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(o.getStatus()) || List<PointRecommendDO> recommendList = recommendPointList.stream().filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(o.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(o.getStatus()) || PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(o.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_4.getCode().equals(o.getStatus())) PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_4.getCode().equals(o.getStatus()))
.filter(o->request.getShopIds().contains(o.getShopId())).collect(Collectors.toList()); .filter(o -> request.getShopIds().contains(o.getShopId())).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(recommendList)){ if (CollectionUtils.isNotEmpty(recommendList)) {
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "推送失败，铺位已被选"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "推送失败，铺位已被选");
} }
List<Long> shopIds = recommendPointList.stream() List<Long> shopIds = recommendPointList.stream()
.filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(o.getStatus())) .filter(o -> PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(o.getStatus()))
.filter(o->request.getShopIds().contains(o.getShopId())).map(PointRecommendDO::getShopId).collect(Collectors.toList()); .filter(o -> request.getShopIds().contains(o.getShopId())).map(PointRecommendDO::getShopId).collect(Collectors.toList());
if(CollectionUtils.isNotEmpty(shopIds)){ if (CollectionUtils.isNotEmpty(shopIds)) {
throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "请勿重复推送"); throw new ServiceException(ErrorCodeEnum.ERROR_MESSAGE, "请勿重复推送");
}
} }
}
List<PointRecommendDO> recommendList = request.convertList(); List<PointRecommendDO> recommendList = request.convertList();
return pointRecommendDAO.addRecommendPoint(recommendList); return pointRecommendDAO.addRecommendPoint(recommendList);
} }
@@ -700,10 +700,10 @@ public class PointServiceImpl implements PointService {
@Override @Override
public Integer updateWantShopNum(UpdateWantShopNumRequest request) { public Integer updateWantShopNum(UpdateWantShopNumRequest request) {
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(request.getLineId());
if(Objects.isNull(lineInfo)){ if (Objects.isNull(lineInfo)) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
} }
if(!WorkflowStageEnum.INTENT.getCode().equals(lineInfo.getWorkflowStage())){ if (!WorkflowStageEnum.INTENT.getCode().equals(lineInfo.getWorkflowStage())) {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_MODIFY_WANT_SHOP_NUM); throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_MODIFY_WANT_SHOP_NUM);
} }
LineInfoDO updateLine = new LineInfoDO(); LineInfoDO updateLine = new LineInfoDO();
@@ -716,7 +716,7 @@ public class PointServiceImpl implements PointService {
public PageInfo<PointPageVO> getTodoList(PointTodoPageRequest request) { public PageInfo<PointPageVO> getTodoList(PointTodoPageRequest request) {
Page<PointInfoDO> pointPage = pointTodoInfoDAO.getUserTodoList(request); Page<PointInfoDO> pointPage = pointTodoInfoDAO.getUserTodoList(request);
List<PointPageVO> resultList = new ArrayList<>(); List<PointPageVO> resultList = new ArrayList<>();
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList()); List<String> developmentManagers = pointPage.stream().map(PointInfoDO::getDevelopmentManager).distinct().collect(Collectors.toList());
Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers); Map<String, String> userNameMap = enterpriseUserDAO.getUserNameMap(developmentManagers);
@@ -732,7 +732,7 @@ public class PointServiceImpl implements PointService {
public PageInfo<MiniPointPageVO> getLineRecommendPointPage(MiniPointPageRequest request) { public PageInfo<MiniPointPageVO> getLineRecommendPointPage(MiniPointPageRequest request) {
Page<MiniPointPageDTO> pointPage = pointRecommendDAO.getLineRecommendPointPage(request); Page<MiniPointPageDTO> pointPage = pointRecommendDAO.getLineRecommendPointPage(request);
List<MiniPointPageVO> resultList = new ArrayList<>(); List<MiniPointPageVO> resultList = new ArrayList<>();
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.getResult().stream().map(MiniPointPageDTO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.getResult().stream().map(MiniPointPageDTO::getRegionId).distinct().collect(Collectors.toList());
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
resultList = MiniPointPageVO.convertVO(pointPage, regionNameMap); resultList = MiniPointPageVO.convertVO(pointPage, regionNameMap);
@@ -747,27 +747,27 @@ public class PointServiceImpl implements PointService {
public Integer lineSelectPoint(SelectPointRequest request) { public Integer lineSelectPoint(SelectPointRequest request) {
Long pointId = request.getPointId(), shopId = request.getShopId(), lineId = request.getLineId(); Long pointId = request.getPointId(), shopId = request.getShopId(), lineId = request.getLineId();
String lockKey = MessageFormat.format(POINT_SELECT_KEY, enterpriseId, pointId); String lockKey = MessageFormat.format(POINT_SELECT_KEY, enterpriseId, pointId);
if(!redisUtilPool.setNxExpire(lockKey, JSONObject.toJSONString(request), 30*1000)){ if (!redisUtilPool.setNxExpire(lockKey, JSONObject.toJSONString(request), 30 * 1000)) {
throw new ServiceException(ErrorCodeEnum.POINT_IS_LOCK); throw new ServiceException(ErrorCodeEnum.POINT_IS_LOCK);
} }
try { try {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
if(Objects.isNull(shopInfo)){ if (Objects.isNull(shopInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ if (!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
} }
if(Objects.nonNull(shopInfo.getPointId())){ if (Objects.nonNull(shopInfo.getPointId())) {
throw new ServiceException(ErrorCodeEnum.SHOP_IS_SELECTED); throw new ServiceException(ErrorCodeEnum.SHOP_IS_SELECTED);
} }
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
if(Objects.isNull(pointInfo)){ if (Objects.isNull(pointInfo)) {
throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.POINT_NOT_EXIST);
} }
if(SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())){ if (SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) {
if(lineId.equals(pointInfo.getLineId())){ if (lineId.equals(pointInfo.getLineId())) {
throw new ServiceException(ErrorCodeEnum.POINT_ALREADY_SELECT); throw new ServiceException(ErrorCodeEnum.POINT_ALREADY_SELECT);
} }
throw new ServiceException(ErrorCodeEnum.POINT_IS_SELECTED); throw new ServiceException(ErrorCodeEnum.POINT_IS_SELECTED);
} }
@@ -791,7 +791,7 @@ public class PointServiceImpl implements PointService {
pointDetailInfoDAO.updatePointDetailInfo(updateDetail); pointDetailInfoDAO.updatePointDetailInfo(updateDetail);
List<ShopSubStageStatusEnum> updateStatusList = new ArrayList<>(); List<ShopSubStageStatusEnum> updateStatusList = new ArrayList<>();
//如果铺位是已审核 则进入上传租赁合同状态 //如果铺位是已审核 则进入上传租赁合同状态
if(PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())){ if (PointStatusEnum.POINT_STATUS_5.getCode().equals(pointInfo.getPointStatus())) {
selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12; selectStatus = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_12;
updateStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20); updateStatusList.add(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20);
Map<String, String> templateParam = new HashMap<>(); Map<String, String> templateParam = new HashMap<>();
@@ -799,11 +799,11 @@ public class PointServiceImpl implements PointService {
} }
updateStatusList.add(selectStatus); updateStatusList.add(selectStatus);
shopStageInfoDAO.batchUpdateShopStageStatus(shopId, updateStatusList); shopStageInfoDAO.batchUpdateShopStageStatus(shopId, updateStatusList);
if (selectStatus.equals( ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11)){ if (selectStatus.equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_11)) {
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("pointName",pointInfo.getPointName()) ; map.put("pointName", pointInfo.getPointName());
map.put("pointAddress",pointInfo.getAddress()); map.put("pointAddress", pointInfo.getAddress());
commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()),
MessageEnum.MESSAGE_13, MessageEnum.MESSAGE_13,
map); map);
@@ -815,9 +815,10 @@ public class PointServiceImpl implements PointService {
redisUtilPool.delKey(lockKey); redisUtilPool.delKey(lockKey);
} }
} }
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Integer lineRejectPoint(RejectPointRequest request){ public Integer lineRejectPoint(RejectPointRequest request) {
return pointRecommendDAO.rejectPoint(request.getShopId(), request.getPointId(), request.getReason()); return pointRecommendDAO.rejectPoint(request.getShopId(), request.getPointId(), request.getReason());
} }
@@ -827,14 +828,14 @@ public class PointServiceImpl implements PointService {
public Long miniAddPointDetailInfo(MiniAddPointRequest request) { public Long miniAddPointDetailInfo(MiniAddPointRequest request) {
Long lineId = request.getCurLineId(); Long lineId = request.getCurLineId();
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId);
if(Objects.isNull(lineInfo)){ if (Objects.isNull(lineInfo)) {
throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.LINE_ID_IS_NOT_EXIST);
} }
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
if(Objects.isNull(shopInfo)){ if (Objects.isNull(shopInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
if(Objects.nonNull(shopInfo.getPointId())){ if (Objects.nonNull(shopInfo.getPointId())) {
throw new ServiceException(ErrorCodeEnum.SHOP_IS_SELECTED); throw new ServiceException(ErrorCodeEnum.SHOP_IS_SELECTED);
} }
PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request); PointDetailInfoDO pointDetailInfo = MiniAddPointRequest.convertDO(request);
@@ -868,9 +869,9 @@ public class PointServiceImpl implements PointService {
updatePoint.setShopId(shopInfo.getId()); updatePoint.setShopId(shopInfo.getId());
pointInfoDAO.updatePointInfo(updatePoint); pointInfoDAO.updatePointInfo(updatePoint);
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername",lineInfo.getUsername()); map.put("partnerUsername", lineInfo.getUsername());
map.put("partnerMobile",lineInfo.getMobile()); map.put("partnerMobile", lineInfo.getMobile());
map.put("pointName",pointInfo.getPointName()) ; map.put("pointName", pointInfo.getPointName());
commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()), commonService.sendQWMessage(Collections.singletonList(shopInfo.getInvestmentManager()),
MessageEnum.MESSAGE_51, MessageEnum.MESSAGE_51,
map); map);
@@ -878,25 +879,25 @@ public class PointServiceImpl implements PointService {
} }
@Override @Override
public Integer uploadRentContract(AddRentContractRequest request){ public Integer uploadRentContract(AddRentContractRequest request) {
if(!request.check()){ if (!request.check()) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
Long pointId = request.getPointId(), shopId = request.getShopId(); Long pointId = request.getPointId(), shopId = request.getShopId();
if(Objects.isNull(pointId) && Objects.nonNull(shopId)){ if (Objects.isNull(pointId) && Objects.nonNull(shopId)) {
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
pointId = shopInfo.getPointId(); pointId = shopInfo.getPointId();
} }
if(Objects.nonNull(pointId) && Objects.isNull(shopId)){ if (Objects.nonNull(pointId) && Objects.isNull(shopId)) {
PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId); PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(pointId);
shopId = pointInfo.getShopId(); shopId = pointInfo.getShopId();
} }
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_2); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopId, ShopSubStageEnum.SHOP_STAGE_2);
if(Objects.isNull(shopSubStageInfo)){ if (Objects.isNull(shopSubStageInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_ERROR); throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_ERROR);
} }
List<Integer> operateStatusList = Lists.newArrayList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus()); List<Integer> operateStatusList = Lists.newArrayList(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20.getShopSubStageStatus(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus());
if(!operateStatusList.contains(shopSubStageInfo.getShopSubStageStatus())){ if (!operateStatusList.contains(shopSubStageInfo.getShopSubStageStatus())) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
} }
//是否存在租赁合同 //是否存在租赁合同
@@ -904,16 +905,16 @@ public class PointServiceImpl implements PointService {
ShopRentInfoDO shopRentInfo = AddRentContractRequest.convertDO(request); ShopRentInfoDO shopRentInfo = AddRentContractRequest.convertDO(request);
shopRentInfo.setShopId(shopId); shopRentInfo.setShopId(shopId);
shopRentInfo.setPointId(pointId); shopRentInfo.setPointId(pointId);
if(Objects.isNull(rentContract)){ if (Objects.isNull(rentContract)) {
shopRentInfoDAO.addShopRentInfo(shopRentInfo); shopRentInfoDAO.addShopRentInfo(shopRentInfo);
}else{ } else {
shopRentInfo.setId(rentContract.getId()); shopRentInfo.setId(rentContract.getId());
shopRentInfoDAO.updateRentContract(shopRentInfo); shopRentInfoDAO.updateRentContract(shopRentInfo);
} }
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopSubStageInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopSubStageInfo.getLineId());
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername",lineInfo.getUsername()); map.put("partnerUsername", lineInfo.getUsername());
map.put("partnerMobile",lineInfo.getMobile()); map.put("partnerMobile", lineInfo.getMobile());
commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()),
MessageEnum.MESSAGE_15, MessageEnum.MESSAGE_15,
map); map);
@@ -923,7 +924,7 @@ public class PointServiceImpl implements PointService {
@Override @Override
public ShopRentInfoVO getRentContractDetail(Long shopId) { public ShopRentInfoVO getRentContractDetail(Long shopId) {
ShopRentInfoDO rentContract = shopRentInfoDAO.getRentContractByShopId(shopId); ShopRentInfoDO rentContract = shopRentInfoDAO.getRentContractByShopId(shopId);
if(Objects.isNull(rentContract)){ if (Objects.isNull(rentContract)) {
return null; return null;
} }
ShopRentInfoVO result = ShopRentInfoVO.build(rentContract); ShopRentInfoVO result = ShopRentInfoVO.build(rentContract);
@@ -931,7 +932,7 @@ public class PointServiceImpl implements PointService {
result.setStatus(shopSubStageInfo.getShopSubStageStatus()); result.setStatus(shopSubStageInfo.getShopSubStageStatus());
boolean isAudit = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()) || boolean isAudit = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()) ||
ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus()); ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus());
if(Objects.nonNull(shopSubStageInfo.getAuditId()) && isAudit){ if (Objects.nonNull(shopSubStageInfo.getAuditId()) && isAudit) {
//当前是审核过的状态才获取原因 //当前是审核过的状态才获取原因
ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(shopSubStageInfo.getAuditId()); ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(shopSubStageInfo.getAuditId());
result.setAuditInfo(AuditInfoVO.convertVO(auditInfo)); result.setAuditInfo(AuditInfoVO.convertVO(auditInfo));
@@ -948,14 +949,14 @@ public class PointServiceImpl implements PointService {
public Integer auditRentContract(AuditRentContractRequest request) { public Integer auditRentContract(AuditRentContractRequest request) {
Long shopId = request.getShopId(); Long shopId = request.getShopId();
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId()); ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(request.getShopId());
if(Objects.isNull(shopInfo)){ if (Objects.isNull(shopInfo)) {
throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);
} }
if(!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())){ if (!ShopStageEnum.SHOP_STAGE_1.getShopStage().equals(shopInfo.getShopStage())) {
throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE); throw new ServiceException(ErrorCodeEnum.SHOP_STAGE_NOT_OPERATE);
} }
ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2); ShopStageInfoDO shopStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2);
if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21.getShopSubStageStatus())){ if (!shopStageInfo.getShopSubStageStatus().equals(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21.getShopSubStageStatus())) {
throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE);
} }
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId());
@@ -966,10 +967,10 @@ public class PointServiceImpl implements PointService {
Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT)); Long auditId = shopAuditInfoDAO.addAuditInfo(AuditRentContractRequest.convert(request, AuditTypeEnum.UPLOAD_RENT_CONTRACT));
ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22; ShopSubStageStatusEnum subStageStatus = AuditResultTypeEnum.PASS.getCode().equals(request.getResultType()) ? ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23 : ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22;
if(AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())){ if (AuditResultTypeEnum.REJECT.getCode().equals(request.getResultType())) {
//commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null); //commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.RENT_CONTRACT_AUDIT_FAIL, null);
} }
if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.equals(subStageStatus)){ if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_23.equals(subStageStatus)) {
//审核通过铺位变为已签约 //审核通过铺位变为已签约
PointInfoDO updatePoint = new PointInfoDO(); PointInfoDO updatePoint = new PointInfoDO();
updatePoint.setId(shopInfo.getPointId()); updatePoint.setId(shopInfo.getPointId());
@@ -980,17 +981,17 @@ public class PointServiceImpl implements PointService {
updateShop.setShopStage(ShopStageEnum.SHOP_STAGE_2.getShopStage()); updateShop.setShopStage(ShopStageEnum.SHOP_STAGE_2.getShopStage());
List<UserRoleEnum> roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER); List<UserRoleEnum> roleList = Arrays.asList(UserRoleEnum.THEATER_MANAGER, UserRoleEnum.OPERATIONS_MANAGER, UserRoleEnum.REGION_MANAGER);
String shopManagerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(shopInfo.getRegionId(), roleList); String shopManagerUserId = sysRoleService.getUserIdByRegionIdWithRolePriority(shopInfo.getRegionId(), roleList);
if(StringUtils.isBlank(shopManagerUserId)){ if (StringUtils.isBlank(shopManagerUserId)) {
shopManagerUserId = userAuthMappingService.getShopManagerUserId(); shopManagerUserId = userAuthMappingService.getShopManagerUserId();
} }
updateShop.setShopManagerUserId(shopManagerUserId); updateShop.setShopManagerUserId(shopManagerUserId);
shopInfoDAO.updateShopInfo(updateShop); shopInfoDAO.updateShopInfo(updateShop);
//发送工作通知 //发送工作通知
Map<String, String> requestMap = new HashMap<>(); Map<String, String> requestMap = new HashMap<>();
requestMap.put("partnerName",lineInfo.getUsername()); requestMap.put("partnerName", lineInfo.getUsername());
requestMap.put("partnerMobile",lineInfo.getMobile()); requestMap.put("partnerMobile", lineInfo.getMobile());
requestMap.put("lineId",String.valueOf(lineInfo.getId())); requestMap.put("lineId", String.valueOf(lineInfo.getId()));
requestMap.put("shopId",String.valueOf(shopId)); requestMap.put("shopId", String.valueOf(shopId));
// if (Objects.nonNull(shopInfo.getShopName())) { // if (Objects.nonNull(shopInfo.getShopName())) {
// requestMap.put("storeName",shopInfo.getShopName()); // requestMap.put("storeName",shopInfo.getShopName());
// commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap); // commonService.sendMessage(Arrays.asList(lineInfo.getInvestmentManager()),MessageEnum.MESSAGE_16,requestMap);
@@ -1004,18 +1005,18 @@ public class PointServiceImpl implements PointService {
} }
@Override @Override
public Integer updateRentContract(UpdateRentContractRequest request){ public Integer updateRentContract(UpdateRentContractRequest request) {
if(!request.check()){ if (!request.check()) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
ShopRentInfoDO shopRentInfo = UpdateRentContractRequest.convertDO(request); ShopRentInfoDO shopRentInfo = UpdateRentContractRequest.convertDO(request);
ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2); ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(request.getShopId(), ShopSubStageEnum.SHOP_STAGE_2);
if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_22.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) {
shopStageInfoDAO.updateShopStageAndAuditInfo(shopRentInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21, null); shopStageInfoDAO.updateShopStageAndAuditInfo(shopRentInfo.getShopId(), ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21, null);
LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopSubStageInfo.getLineId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopSubStageInfo.getLineId());
HashMap<String, String> map = new HashMap<>(); HashMap<String, String> map = new HashMap<>();
map.put("partnerUsername",lineInfo.getUsername()); map.put("partnerUsername", lineInfo.getUsername());
map.put("partnerMobile",lineInfo.getMobile()); map.put("partnerMobile", lineInfo.getMobile());
commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()), commonService.sendQWMessage(Collections.singletonList(lineInfo.getInvestmentManager()),
MessageEnum.MESSAGE_15, MessageEnum.MESSAGE_15,
map); map);
@@ -1031,7 +1032,7 @@ public class PointServiceImpl implements PointService {
request.setPageSize(pageSize); request.setPageSize(pageSize);
Page<PointInfoDO> pointPage = pointTodoInfoDAO.getUserTodoList(request); Page<PointInfoDO> pointPage = pointTodoInfoDAO.getUserTodoList(request);
List<PointToDoVO> resultList = new ArrayList<>(); List<PointToDoVO> resultList = new ArrayList<>();
if(Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())){ if (Objects.nonNull(pointPage) && CollectionUtils.isNotEmpty(pointPage.getResult())) {
List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = pointPage.stream().map(PointInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<Long> pointIds = pointPage.stream().map(PointInfoDO::getId).collect(Collectors.toList()); List<Long> pointIds = pointPage.stream().map(PointInfoDO::getId).collect(Collectors.toList());
//获取提交时间 //获取提交时间
@@ -1048,17 +1049,17 @@ public class PointServiceImpl implements PointService {
public PageInfo<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize) { public PageInfo<RentInfoToDoVO> getRentContractToDoPage(String userId, Integer pageNumber, Integer pageSize) {
Page<RentInfoToDoVO> todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize); Page<RentInfoToDoVO> todoPage = shopStageInfoDAO.getRentContractToDoPage(userId, pageNumber, pageSize);
List<RentInfoToDoVO> resultList = null; List<RentInfoToDoVO> resultList = null;
if(Objects.nonNull(todoPage) && CollectionUtils.isNotEmpty(todoPage.getResult())){ if (Objects.nonNull(todoPage) && CollectionUtils.isNotEmpty(todoPage.getResult())) {
List<Long> shopIds = todoPage.getResult().stream().map(RentInfoToDoVO::getShopId).collect(Collectors.toList()); List<Long> shopIds = todoPage.getResult().stream().map(RentInfoToDoVO::getShopId).collect(Collectors.toList());
List<ShopInfoDO> shopList = shopInfoDAO.getShopListByIds(shopIds); List<ShopInfoDO> shopList = shopInfoDAO.getShopListByIds(shopIds);
Map<Long, ShopInfoDO> shopPointMap = shopList.stream().collect(Collectors.toMap(k->k.getId(), Function.identity())); Map<Long, ShopInfoDO> shopPointMap = shopList.stream().collect(Collectors.toMap(k -> k.getId(), Function.identity()));
List<Long> regionIds = shopList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList()); List<Long> regionIds = shopList.stream().map(ShopInfoDO::getRegionId).distinct().collect(Collectors.toList());
List<Long> pointIds = shopList.stream().map(ShopInfoDO::getPointId).collect(Collectors.toList()); List<Long> pointIds = shopList.stream().map(ShopInfoDO::getPointId).collect(Collectors.toList());
List<PointInfoDO> pointList = pointInfoDAO.getPointListByIds(pointIds); List<PointInfoDO> pointList = pointInfoDAO.getPointListByIds(pointIds);
Map<Long, PointInfoDO> pointMap = ListUtils.emptyIfNull(pointList).stream().collect(Collectors.toMap(k->k.getId(), Function.identity())); Map<Long, PointInfoDO> pointMap = ListUtils.emptyIfNull(pointList).stream().collect(Collectors.toMap(k -> k.getId(), Function.identity()));
Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds); Map<Long, String> regionNameMap = regionService.getBelongWarRegionNameMap(regionIds);
List<ShopRentInfoDO> rentContractList = shopRentInfoDAO.getRentContractByShopIds(shopIds); List<ShopRentInfoDO> rentContractList = shopRentInfoDAO.getRentContractByShopIds(shopIds);
Map<Long, Date> rentContractSubmitTimeMap = ListUtils.emptyIfNull(rentContractList).stream().collect(Collectors.toMap(k->k.getShopId(), v->v.getCreateTime())); Map<Long, Date> rentContractSubmitTimeMap = ListUtils.emptyIfNull(rentContractList).stream().collect(Collectors.toMap(k -> k.getShopId(), v -> v.getCreateTime()));
resultList = RentInfoToDoVO.convert(todoPage, shopPointMap, pointMap, regionNameMap, rentContractSubmitTimeMap); resultList = RentInfoToDoVO.convert(todoPage, shopPointMap, pointMap, regionNameMap, rentContractSubmitTimeMap);
} }
PageInfo resultPage = new PageInfo(todoPage); PageInfo resultPage = new PageInfo(todoPage);
@@ -1071,55 +1072,55 @@ public class PointServiceImpl implements PointService {
public Boolean linePointToShopPoint(Long lineId) { public Boolean linePointToShopPoint(Long lineId) {
//查询所有的推荐 如果传入的lineId 则查询该线索的所有推荐 //查询所有的推荐 如果传入的lineId 则查询该线索的所有推荐
List<PointRecommendDO> allRecommendPointList = pointRecommendDAO.getAllRecommendPointList(lineId); List<PointRecommendDO> allRecommendPointList = pointRecommendDAO.getAllRecommendPointList(lineId);
if (CollectionUtils.isEmpty(allRecommendPointList)){ if (CollectionUtils.isEmpty(allRecommendPointList)) {
return Boolean.TRUE; return Boolean.TRUE;
} }
List<PointRecommendDO> recommendList = new ArrayList<>(); List<PointRecommendDO> recommendList = new ArrayList<>();
List<PointRecommendDO> updateList = new ArrayList<>(); List<PointRecommendDO> updateList = new ArrayList<>();
allRecommendPointList.forEach(recommend -> { allRecommendPointList.forEach(recommend -> {
//如果是待选择 //如果是待选择
if(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(recommend.getStatus())|| if (PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_1.getCode().equals(recommend.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_5.getCode().equals(recommend.getStatus())|| PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_5.getCode().equals(recommend.getStatus()) ||
PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6.getCode().equals(recommend.getStatus())){ PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_6.getCode().equals(recommend.getStatus())) {
//将单条加盟商数据 分配到各个门店商 //将单条加盟商数据 分配到各个门店商
Long tempLineId = recommend.getLineId(); Long tempLineId = recommend.getLineId();
List<ShopInfoDO> shopList = shopInfoDAO.getShopList(tempLineId); List<ShopInfoDO> shopList = shopInfoDAO.getShopList(tempLineId);
for (ShopInfoDO shopInfoDO : shopList) { for (ShopInfoDO shopInfoDO : shopList) {
PointRecommendDO tempPointRecommendDO = new PointRecommendDO(); PointRecommendDO tempPointRecommendDO = new PointRecommendDO();
BeanUtil.copyProperties(recommend,tempPointRecommendDO); BeanUtil.copyProperties(recommend, tempPointRecommendDO);
tempPointRecommendDO.setShopId(shopInfoDO.getId()); tempPointRecommendDO.setShopId(shopInfoDO.getId());
recommendList.add(tempPointRecommendDO); recommendList.add(tempPointRecommendDO);
} }
} }
//已选 已被他人选择 //已选 已被他人选择
if(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(recommend.getStatus())){ if (PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_2.getCode().equals(recommend.getStatus())) {
//查询该加盟商选择的这个店 //查询该加盟商选择的这个店
ShopInfoDO shopInfoByPointId = shopInfoDAO.getShopInfoByPointId(recommend.getLineId(), recommend.getPointId()); ShopInfoDO shopInfoByPointId = shopInfoDAO.getShopInfoByPointId(recommend.getLineId(), recommend.getPointId());
recommend.setShopId(shopInfoByPointId.getId()); recommend.setShopId(shopInfoByPointId.getId());
updateList.add(recommend); updateList.add(recommend);
} }
if(PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(recommend.getStatus())){ if (PointRecommendStatusEnum.POINT_RECOMMEND_STATUS_3.getCode().equals(recommend.getStatus())) {
List<PointRecommendDO> recommendPointListByPointId = pointRecommendDAO.getRecommendPointListByPointId(recommend.getPointId()); List<PointRecommendDO> recommendPointListByPointId = pointRecommendDAO.getRecommendPointListByPointId(recommend.getPointId());
for (PointRecommendDO pointRecommendDO: recommendPointListByPointId) { for (PointRecommendDO pointRecommendDO : recommendPointListByPointId) {
//表示当前门店已选址 //表示当前门店已选址
if (pointRecommendDO.getLineId().equals(recommend.getLineId())){ if (pointRecommendDO.getLineId().equals(recommend.getLineId())) {
continue; continue;
} }
List<ShopInfoDO> shopList = shopInfoDAO.getShopList(pointRecommendDO.getLineId()); List<ShopInfoDO> shopList = shopInfoDAO.getShopList(pointRecommendDO.getLineId());
for (ShopInfoDO shopInfoDO : shopList) { for (ShopInfoDO shopInfoDO : shopList) {
PointRecommendDO tempPointRecommendDO = new PointRecommendDO(); PointRecommendDO tempPointRecommendDO = new PointRecommendDO();
BeanUtil.copyProperties(recommend,tempPointRecommendDO); BeanUtil.copyProperties(recommend, tempPointRecommendDO);
tempPointRecommendDO.setShopId(shopInfoDO.getId()); tempPointRecommendDO.setShopId(shopInfoDO.getId());
recommendList.add(tempPointRecommendDO); recommendList.add(tempPointRecommendDO);
} }
} }
} }
}); });
if (CollectionUtils.isNotEmpty(updateList)){ if (CollectionUtils.isNotEmpty(updateList)) {
pointRecommendDAO.batchUpdateShopId(updateList); pointRecommendDAO.batchUpdateShopId(updateList);
} }
if (CollectionUtils.isNotEmpty(recommendList)){ if (CollectionUtils.isNotEmpty(recommendList)) {
log.info("linePointToShopPoint recommendList:{}", JSONObject.toJSONString(recommendList)); log.info("linePointToShopPoint recommendList:{}", JSONObject.toJSONString(recommendList));
pointRecommendDAO.addRecommendPoint(recommendList); pointRecommendDAO.addRecommendPoint(recommendList);
} }
@@ -1131,7 +1132,7 @@ public class PointServiceImpl implements PointService {
List<String> roleIds = new ArrayList<>(); List<String> roleIds = new ArrayList<>();
//审核人 //审核人
Pair<List<String>, List<String>> firstApproval = getUserIdsAndPositionIds(auditSetting.getFirstApproval()); Pair<List<String>, List<String>> firstApproval = getUserIdsAndPositionIds(auditSetting.getFirstApproval());
if(CollectionUtils.isNotEmpty(firstApproval.getValue())){ if (CollectionUtils.isNotEmpty(firstApproval.getValue())) {
roleIds.addAll(firstApproval.getValue()); roleIds.addAll(firstApproval.getValue());
} }
List<AuditNodeDTO> resultList = new ArrayList<>(); List<AuditNodeDTO> resultList = new ArrayList<>();
@@ -1139,7 +1140,7 @@ public class PointServiceImpl implements PointService {
List<String> firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap); List<String> firstApprovalUserIds = getUserIdsByPositionIds(firstApproval, userIdsMap);
resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager))); resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_0.getCode(), PointAuditRecordDO.SUBMIT_TASK, Boolean.FALSE, Arrays.asList(developmentManager)));
//todo 缺少兜底人 //todo 缺少兜底人
if(CollectionUtils.isNotEmpty(firstApprovalUserIds)){ if (CollectionUtils.isNotEmpty(firstApprovalUserIds)) {
resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds)); resultList.add(new AuditNodeDTO(NodeNoEnum.NODE_NO_1.getCode(), PointAuditRecordDO.RECEIVE_TASK, Boolean.TRUE, firstApprovalUserIds));
} }
return resultList; return resultList;
@@ -1150,7 +1151,7 @@ public class PointServiceImpl implements PointService {
* @param requests * @param requests
* @return * @return
*/ */
private Pair<List<String>, List<String>> getUserIdsAndPositionIds(List<UserAndPositionRequest> requests){ private Pair<List<String>, List<String>> getUserIdsAndPositionIds(List<UserAndPositionRequest> requests) {
List<String> positionIds = ListUtils.emptyIfNull(requests).stream().filter(o -> "position".equals(o.getType())).map(UserAndPositionRequest::getValue).collect(Collectors.toList()); List<String> positionIds = ListUtils.emptyIfNull(requests).stream().filter(o -> "position".equals(o.getType())).map(UserAndPositionRequest::getValue).collect(Collectors.toList());
List<String> userIds = ListUtils.emptyIfNull(requests).stream().filter(o -> "person".equals(o.getType())).map(UserAndPositionRequest::getValue).collect(Collectors.toList()); List<String> userIds = ListUtils.emptyIfNull(requests).stream().filter(o -> "person".equals(o.getType())).map(UserAndPositionRequest::getValue).collect(Collectors.toList());
return Pair.of(userIds, positionIds); return Pair.of(userIds, positionIds);
@@ -1164,13 +1165,13 @@ public class PointServiceImpl implements PointService {
*/ */
private List<String> getUserIdsByPositionIds(Pair<List<String>, List<String>> userIdsAndPositionIds, Map<String, List<String>> userIdsMap) { private List<String> getUserIdsByPositionIds(Pair<List<String>, List<String>> userIdsAndPositionIds, Map<String, List<String>> userIdsMap) {
Set<String> userIds = new HashSet<>(); Set<String> userIds = new HashSet<>();
if(CollectionUtils.isNotEmpty(userIdsAndPositionIds.getKey())){ if (CollectionUtils.isNotEmpty(userIdsAndPositionIds.getKey())) {
userIds.addAll(userIdsAndPositionIds.getKey()); userIds.addAll(userIdsAndPositionIds.getKey());
} }
if(CollectionUtils.isNotEmpty(userIdsAndPositionIds.getValue())){ if (CollectionUtils.isNotEmpty(userIdsAndPositionIds.getValue())) {
userIdsAndPositionIds.getValue().forEach(positionId -> { userIdsAndPositionIds.getValue().forEach(positionId -> {
List<String> userIdList = userIdsMap.get(positionId); List<String> userIdList = userIdsMap.get(positionId);
if(CollectionUtils.isNotEmpty(userIdList)){ if (CollectionUtils.isNotEmpty(userIdList)) {
userIds.addAll(userIdList); userIds.addAll(userIdList);
} }
}); });
@@ -1178,14 +1179,14 @@ public class PointServiceImpl implements PointService {
return new ArrayList<>(userIds); return new ArrayList<>(userIds);
} }
private PointAuditRecordDO getNextAuditRecord(Integer currentNodeNo, Map<Integer, PointAuditRecordDO> auditRecordMap){ private PointAuditRecordDO getNextAuditRecord(Integer currentNodeNo, Map<Integer, PointAuditRecordDO> auditRecordMap) {
List<NodeNoEnum> nextNodeNoList = NodeNoEnum.getNextNodeNoList(currentNodeNo); List<NodeNoEnum> nextNodeNoList = NodeNoEnum.getNextNodeNoList(currentNodeNo);
if(CollectionUtils.isEmpty(nextNodeNoList)){ if (CollectionUtils.isEmpty(nextNodeNoList)) {
return null; return null;
} }
for (NodeNoEnum nodeNoEnum : nextNodeNoList) { for (NodeNoEnum nodeNoEnum : nextNodeNoList) {
PointAuditRecordDO pointAuditRecord = auditRecordMap.get(nodeNoEnum.getCode()); PointAuditRecordDO pointAuditRecord = auditRecordMap.get(nodeNoEnum.getCode());
if(Objects.nonNull(pointAuditRecord)){ if (Objects.nonNull(pointAuditRecord)) {
return pointAuditRecord; return pointAuditRecord;
} }
} }