diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java index be06c0050..e9a7437c9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/openPreparation/FirstOrderDTO.java @@ -44,4 +44,7 @@ public class FirstOrderDTO { @ApiModelProperty("订货金阶段状态，1500 待上传, 1505 带缴纳,1510 已完成") private Integer firstOrderSubStage; + @ApiModelProperty("提交人") + private String submiter; + } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java index 62b8051a3..2804ef5ae 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/response/SubmitLicenseResponse.java @@ -16,6 +16,9 @@ import java.util.Objects; @Data public class SubmitLicenseResponse { + @ApiModelProperty("审批人") + private String approver; + @ApiModelProperty("主键id") private Long id; diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java index da09dc7ab..7a5cbf35e 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/OpeningOperationPlanVO.java @@ -54,6 +54,14 @@ public class OpeningOperationPlanVO { @ApiModelProperty("审核结果,0待审核，1通过，2拒绝") private Integer resultType; + @ApiModelProperty("审批人") + private String approver; + @ApiModelProperty("提交人") + private String submiter; + + public OpeningOperationPlanVO() { + } + public OpeningOperationPlanVO(OpeningOperationPlanDO openingOperationPlanDO) { this.resultType = openingOperationPlanDO.getResultType(); diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java index b25cd5e8e..d39419e64 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/point/ShopRentInfoVO.java @@ -73,6 +73,9 @@ public class ShopRentInfoVO { @ApiModelProperty("审核信息") private AuditInfoVO auditInfo; + @ApiModelProperty("审批人") + private String approver; + public static ShopRentInfoVO build(ShopRentInfoDO shopRentInfo) { ShopRentInfoVO result = new ShopRentInfoVO(); result.setRentId(shopRentInfo.getId()); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java index 9f5b05a02..98a42b63c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/UserAuthMappingService.java @@ -52,6 +52,8 @@ public interface UserAuthMappingService { */ EnterpriseUserDO getUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId); + List getAllUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId); + /** * 获取有区域权限和职位 所有人 * @param userRoleEnum diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java index 939c167fd..71c94f915 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ApplyLicenseServiceImpl.java @@ -20,6 +20,7 @@ import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; import com.cool.store.service.CoolStoreStartFlowService; import com.cool.store.service.PreparationService; +import com.cool.store.service.SysStoreAppService; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.StringUtils; @@ -86,6 +87,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Resource RedisUtilPool redisUtilPool; + @Resource + private SystemBuildingShopMapper systemBuildingShopMapper; + + @Resource + EnterpriseUserMapper enterpriseUserMapper; + @Override @Transactional(rollbackFor = Exception.class) @@ -200,6 +207,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { return submitLicenseResponse; } } + + SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); + EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); + if (Objects.nonNull(userInfoByJobnumber)){ + submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + } //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 return submitLicenseResponse; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java index 24546ef28..d7c83021b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/FirstOrderServiceImp.java @@ -4,20 +4,15 @@ import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; -import com.cool.store.dao.EnterpriseUserDAO; -import com.cool.store.dao.FirstOrderDAO; -import com.cool.store.dao.LineInfoDAO; -import com.cool.store.dao.ShopStageInfoDAO; +import com.cool.store.dao.*; import com.cool.store.dto.openPreparation.FirstOrderDTO; -import com.cool.store.entity.FirstOrderDO; -import com.cool.store.entity.LineInfoDO; -import com.cool.store.entity.ShopInfoDO; -import com.cool.store.entity.ShopStageInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.enums.SMSMsgEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.ShopInfoMapper; import com.cool.store.request.FirstOrderRequest; import com.cool.store.service.CoolStoreStartFlowService; import com.cool.store.service.FirstOrderService; @@ -63,6 +58,9 @@ public class FirstOrderServiceImp implements FirstOrderService { @Resource private LineInfoDAO lineInfoDAO; + @Resource + ShopInfoDAO shopInfoDAO; + @Override public Integer saveOrder(FirstOrderRequest request, LoginUserInfo user) { log.info("save order:{}", JSONObject.toJSONString(request)); @@ -165,6 +163,9 @@ public class FirstOrderServiceImp implements FirstOrderService { } } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); + EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); + order.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); return order; } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java index fe753bbc0..4e2e5b95d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpeningOperationPlanImpl.java @@ -9,15 +9,14 @@ import com.cool.store.dto.Preparation.PreparationDTO; import com.cool.store.dto.openPreparation.OpenPlanShopInfoDTO; import com.cool.store.dto.openPreparation.PlanLineDTO; import com.cool.store.dto.openPreparation.UserNameDTO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.OpeningOperationPlanDO; -import com.cool.store.entity.ShopInfoDO; -import com.cool.store.entity.ShopStageInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.AuditStatusEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; +import com.cool.store.mapper.UserAuthMappingMapper; import com.cool.store.request.OpeningOperationPlanRequest; import com.cool.store.request.PlanListRequest; import com.cool.store.service.*; @@ -64,6 +63,9 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { @Resource private ShopService shopService; + @Resource + UserAuthMappingService userAuthMappingService; + @Override @Transactional(rollbackFor = Exception.class) public Long savePlan(OpeningOperationPlanRequest request, LoginUserInfo userInfo) { @@ -109,20 +111,31 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { log.error(" getPlanByShopId shopId is null"); throw new ServiceException(ErrorCodeEnum.SHOP_ID_IS_NULL); } + OpeningOperationPlanVO openingOperationPlanVO = new OpeningOperationPlanVO(); + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); OpeningOperationPlanDO openingOperationPlanDO = openingOperationPlanDAO.selectByShopId(shopId); + EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); + List allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId()); + List collect = allUserByRoleEnumAndRegionId.stream() + .filter(user -> user.getName() != null) + .map(user -> user.getName() + "_" + user.getJobnumber()) + .collect(Collectors.toList()); if (Objects.nonNull(openingOperationPlanDO)) { - OpeningOperationPlanVO openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); + openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); + openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); String preparationUserIds = openingOperationPlanDO.getPreparationUserIds(); List stream = Arrays.stream(preparationUserIds.split(CommonConstants.COMMA)).collect(Collectors.toList()); List nameByUserId = enterpriseUserDAO.getNameByUserId(stream); String userName = enterpriseUserDAO.getUserName(openingOperationPlanDO.getSubmittedUserId()); openingOperationPlanVO.setSubmittedUserName(userName); openingOperationPlanVO.setPreparationUsers(nameByUserId); - ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); openingOperationPlanVO.setShopName(shopInfo.getShopName()); return openingOperationPlanVO; } - return null; + openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); + return openingOperationPlanVO; } @Override diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java index be9036f24..a2696744e 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java @@ -936,6 +936,10 @@ public class PointServiceImpl implements PointService { ShopAuditInfoDO auditInfo = shopAuditInfoDAO.getAuditInfo(shopSubStageInfo.getAuditId()); result.setAuditInfo(AuditInfoVO.convertVO(auditInfo)); } + ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId()); + LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); + EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager()); + result.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); return result; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java index 6d2f8933c..28c83a305 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/UserAuthMappingServiceImpl.java @@ -177,6 +177,29 @@ public class UserAuthMappingServiceImpl implements UserAuthMappingService { return null; } + @Override + public List getAllUserByRoleEnumAndRegionId(UserRoleEnum userRoleEnum, Long regionId) { + // 查找有区域权限的人 + List authRegionUserIdList = authWarRegionUser(regionId); + if (CollectionUtils.isEmpty(authRegionUserIdList)) { + return null; + } + Long roleId = userRoleEnum.getCode(); + List hasRoleUserIdList = sysRoleMapper.getPositionUserIds(Collections.singletonList(String.valueOf(roleId))); + if (CollectionUtils.isEmpty(hasRoleUserIdList)) { + return null; + } + authRegionUserIdList.retainAll(hasRoleUserIdList); + if (CollectionUtils.isEmpty(authRegionUserIdList)) { + return null; + } + if (CollectionUtils.isNotEmpty(authRegionUserIdList)) { + List userInfoByUserIds = enterpriseUserDAO.getUserInfoByUserIds(authRegionUserIdList); + return userInfoByUserIds; + } + return null; + } + @Override public List getUserByRoleEnumAndRegionIdList(UserRoleEnum userRoleEnum, Long regionId) { // 查找有区域权限的人