更新 PointServiceImpl.java
This commit is contained in:
@@ -1203,14 +1203,15 @@ public class PointServiceImpl implements PointService {
|
|||||||
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();
|
||||||
ShopInfoDO shopInfo = shopInfo = shopInfoDAO.getShopInfo(shopId);;
|
|
||||||
if (Objects.isNull(pointId) && Objects.nonNull(shopId)) {
|
if (Objects.isNull(pointId) && Objects.nonNull(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();
|
||||||
}
|
}
|
||||||
|
ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId);
|
||||||
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);
|
||||||
@@ -1240,14 +1241,14 @@ public class PointServiceImpl implements PointService {
|
|||||||
commonService.sendQWMessage(userIds,
|
commonService.sendQWMessage(userIds,
|
||||||
MessageEnum.MESSAGE_15,
|
MessageEnum.MESSAGE_15,
|
||||||
map);
|
map);
|
||||||
|
// 审批记录
|
||||||
|
operationLogService.addOperationLog(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20, userId, userName,
|
||||||
|
OperationTypeEnum.OPERATION_TYPE_0, "加盟商上传租赁合同", OperationStatusEnum.PROCESSED);
|
||||||
|
List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfo.getInvestRegionId());
|
||||||
|
operationLogService.addOperationLog(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21,
|
||||||
|
userId, userDOList,
|
||||||
|
OperationTypeEnum.OPERATION_TYPE_1, "招商片区老总审核", OperationStatusEnum.NOT_PROCESSED);
|
||||||
}
|
}
|
||||||
// 审批记录
|
|
||||||
operationLogService.addOperationLog(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_20, userId, userName,
|
|
||||||
OperationTypeEnum.OPERATION_TYPE_0, "加盟商上传租赁合同", OperationStatusEnum.PROCESSED);
|
|
||||||
List<EnterpriseUserDO> userDOList = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.REGION_MANAGER, shopInfo.getInvestRegionId());
|
|
||||||
operationLogService.addOperationLog(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_21,
|
|
||||||
userId, userDOList,
|
|
||||||
OperationTypeEnum.OPERATION_TYPE_1, "招商片区老总审核", OperationStatusEnum.NOT_PROCESSED);
|
|
||||||
return shopStageInfoDAO.updateShopStageInfo(shopId, SHOP_SUB_STAGE_STATUS_21);
|
return shopStageInfoDAO.updateShopStageInfo(shopId, SHOP_SUB_STAGE_STATUS_21);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user