From 5a000a74f1245138c3f970d620d7f28c4415ff89 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 5 Jun 2024 16:25:47 +0800 Subject: [PATCH 01/10] feat --- .../mapper/SystemBuildingShopMapper.java | 2 ++ .../mapper/SystemBuildingShopMapper.xml | 5 ++++ .../dto/openPreparation/FirstOrderDTO.java | 3 +++ .../store/response/SubmitLicenseResponse.java | 3 +++ .../cool/store/vo/OpeningOperationPlanVO.java | 8 ++++++ .../cool/store/vo/point/ShopRentInfoVO.java | 3 +++ .../store/service/UserAuthMappingService.java | 2 ++ .../service/impl/ApplyLicenseServiceImpl.java | 11 ++++++++ .../service/impl/FirstOrderServiceImp.java | 17 ++++++------ .../impl/OpeningOperationPlanImpl.java | 27 ++++++++++++++----- .../store/service/impl/PointServiceImpl.java | 4 +++ .../impl/UserAuthMappingServiceImpl.java | 23 ++++++++++++++++ 12 files changed, 93 insertions(+), 15 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java index e14518bfb..7d5553d1f 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java @@ -8,4 +8,6 @@ import org.apache.ibatis.annotations.Param; public interface SystemBuildingShopMapper extends tk.mybatis.mapper.common.Mapper { void updateAuditByShopId(@Param("auditId") Long auditId, @Param("shopId") Long shopId); + + SystemBuildingShopDO selectByShopId(@Param("shopId") Long shopId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml index 419da4c0f..ff85d4f10 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml @@ -13,5 +13,10 @@ set audit_id = #{auditId} where shop_id = #{shopId} + \ No newline at end of file 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 013ea8d79..242711b2d 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) @@ -198,6 +205,10 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { return submitLicenseResponse; } } + + SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); + EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); + 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 6a179b932..1f648d39b 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 && user.getJobnumber() != 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) { // 查找有区域权限的人 From 3f88f7874577d17f1f1c0a59bcbf40df4c66d945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 5 Jun 2024 16:29:50 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BA=91=E7=AB=8B=E6=96=B9=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/cool/store/constants/CommonConstants.java | 2 ++ .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 1 + .../cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- .../cool/store/service/impl/OpeningOperationPlanImpl.java | 2 +- .../java/com/cool/store/service/impl/YlfServiceImpl.java | 6 ++++++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 43c06fe65..b621c994b 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -28,6 +28,8 @@ public class CommonConstants { //十秒 public static final int TEN_SECONDS = 10000; + public static final int ONE_SECONDS = 1000; + /** * 跟进任务通知缓存时间 1小时 */ diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index 65aa2734e..88638d354 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -212,6 +212,7 @@ public enum ErrorCodeEnum { XFSG_SERVICE_ERROR(103099,"鲜丰服务调用失败",null), GET_FIRST_ORDER(103021,"获取鲜丰首批订货金失败",null), YLF_ERROR(110001, "云立方接口异常！异常信息：{0}", null), + YLF_DATA_IS_NULL(110002, "请联系工程维护云立方系统门店信息!", null), //装修 THREE_ACCEPTANCE(121001,"提交三方验收失败",null), CHECK_ITEM(12002,"插入检查项失败",null), 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 01fb80974..939c167fd 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 @@ -97,7 +97,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { String lockKey = "submitLicense:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); boolean acquired = Boolean.FALSE; - acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.TEN_SECONDS); + acquired = redisUtilPool.setNxExpire(lockKey, lockValue, CommonConstants.ONE_SECONDS); if (!acquired) { throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); } 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 6a179b932..fe753bbc0 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 @@ -214,7 +214,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { return Boolean.TRUE; } catch (Exception e) { log.error("获取鲜丰订货金异常或更新状态失败"); - throw new ServiceException(ErrorCodeEnum.YLF_ERROR); + throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java index 2556736cc..87e209fcb 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/YlfServiceImpl.java @@ -53,6 +53,9 @@ public class YlfServiceImpl implements YlfService { return list.get(0); } } catch (Exception e) { + if ("无对应数据！".equals(((ServiceException)e).getErrorMessage())){ + throw new ServiceException(ErrorCodeEnum.YLF_DATA_IS_NULL); + } throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); } return null; @@ -95,6 +98,9 @@ public class YlfServiceImpl implements YlfService { } } catch (Exception e) { log.info("调用云立方获取项目列表异常,getProjectList error:{}", e); + if ("无对应数据！".equals(((ServiceException)e).getErrorMessage())){ + throw new ServiceException(ErrorCodeEnum.YLF_DATA_IS_NULL); + } throw new ServiceException(ErrorCodeEnum.YLF_ERROR,((ServiceException)e).getErrorMessage()); } From 3234b26cd9e751f5cd563736125f6d15aa705517 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 5 Jun 2024 16:35:32 +0800 Subject: [PATCH 03/10] feat2 --- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 03f2350b8..c6514ad49 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 @@ -210,7 +210,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); - submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + if (Objects.nonNull(userInfoByJobnumber)){ + submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + } //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 return submitLicenseResponse; } From fa5f9f7467887161da7d8996e0158bb23f53f112 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 5 Jun 2024 16:45:08 +0800 Subject: [PATCH 04/10] feat3 --- .../com/cool/store/service/impl/OpeningOperationPlanImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f648d39b..6279a6e37 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 @@ -117,7 +117,7 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); List allUserByRoleEnumAndRegionId = userAuthMappingService.getAllUserByRoleEnumAndRegionId(UserRoleEnum.OPERATIONS_MANAGER, shopInfo.getRegionId()); List collect = allUserByRoleEnumAndRegionId.stream() - .filter(user -> user.getName() != null && user.getJobnumber() != null) + .filter(user -> user.getName() != null) .map(user -> user.getName() + "_" + user.getJobnumber()) .collect(Collectors.toList()); if (Objects.nonNull(openingOperationPlanDO)) { From 4a433d7743929ba57464615024107be82a1462a0 Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 5 Jun 2024 17:58:27 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=A4=9A=E7=AB=AF=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/SignFranchiseServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java index 128c57921..ce55cf0b7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SignFranchiseServiceImpl.java @@ -140,6 +140,10 @@ public class SignFranchiseServiceImpl implements SignFranchiseService, AuditResu if (Objects.isNull(request.getShopId())) { throw new ServiceException(ErrorCodeEnum.SHOP_ID_NOT_EXIST); } + SignFranchiseDO isExist = signFranchiseMapper.selectByShopId(request.getShopId()); + if (Objects.nonNull(isExist) && Objects.isNull(request.getId())){ + throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); + } String lockKey = "submitSignFranchise:" + request.getShopId(); //流水 String lockValue = UUID.randomUUID().toString(); From 7ba6b0d709767c28ac1d8d0474f6bf6b010ebcee Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 5 Jun 2024 18:01:14 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=A4=9A=E7=AB=AF=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/mapper/SystemBuildingShopMapper.java | 3 +++ .../src/main/resources/mapper/SystemBuildingShopMapper.xml | 5 +++++ .../com/cool/store/service/impl/SysStoreAppServiceImpl.java | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java index e14518bfb..02cd4b25d 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/SystemBuildingShopMapper.java @@ -8,4 +8,7 @@ import org.apache.ibatis.annotations.Param; public interface SystemBuildingShopMapper extends tk.mybatis.mapper.common.Mapper { void updateAuditByShopId(@Param("auditId") Long auditId, @Param("shopId") Long shopId); + + SystemBuildingShopDO selectByShopId(@Param("shopId") Long shopId); + } diff --git a/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml index 419da4c0f..c52907daa 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SystemBuildingShopMapper.xml @@ -13,5 +13,10 @@ set audit_id = #{auditId} where shop_id = #{shopId} + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java index fc54242fa..37727319b 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/SysStoreAppServiceImpl.java @@ -95,6 +95,10 @@ public class SysStoreAppServiceImpl implements SysStoreAppService, AuditResultSe if (Objects.isNull(request)) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } + SystemBuildingShopDO isExist = systemBuildingShopMapper.selectByShopId(request.getShopId()); + if (Objects.nonNull(isExist) && Objects.isNull(request.getId())){ + throw new ServiceException(ErrorCodeEnum.DUPLICATE_SUBMISSION); + } String lockKey = "submitSysBuildStore:" + request.getShopId(); String lockValue = UUID.randomUUID().toString(); boolean acquired = false; From f6fcdcd6d88a7d6114fbc9446ae0ede81da2d476 Mon Sep 17 00:00:00 2001 From: guohb <1808583880@qq.com> Date: Wed, 5 Jun 2024 20:58:56 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9D=A3=E5=AF=BC?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ApplyLicenseServiceImpl.java | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) 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 c6514ad49..85b6baedc 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 @@ -17,10 +17,7 @@ import com.cool.store.request.SubmitLicenseRequest; import com.cool.store.response.GetStoreInfoByCodeResponse; import com.cool.store.response.LicenseListResponse; 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.service.*; import com.cool.store.utils.RedisUtilPool; import com.cool.store.utils.StringUtil; import com.cool.store.utils.poi.StringUtils; @@ -93,6 +90,9 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Resource EnterpriseUserMapper enterpriseUserMapper; + @Resource + UserAuthMappingService userAuthMappingService; + @Override @Transactional(rollbackFor = Exception.class) @@ -209,10 +209,19 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); - EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); - if (Objects.nonNull(userInfoByJobnumber)){ - submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + if (Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ + EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); + if (Objects.nonNull(userInfoByJobnumber)){ + submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); + } + }else { + EnterpriseUserDO enterpriseUserDO = userAuthMappingService.hierarchicalSearch(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); + if (Objects.nonNull(enterpriseUserDO)){ + submitLicenseResponse.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + } } + + //3.既没有提交数据，也没有在鲜丰端查到证照信息，则返回空自由填写 return submitLicenseResponse; } From 60ba1d54d6bb0480b977fa3193f2ef0bb0c45baa Mon Sep 17 00:00:00 2001 From: guohb <1808583880@qq.com> Date: Wed, 5 Jun 2024 20:59:49 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9D=A3=E5=AF=BC?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/service/impl/ApplyLicenseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 85b6baedc..f71d5f387 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 @@ -209,7 +209,7 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } SystemBuildingShopDO systemBuildingShopDO = systemBuildingShopMapper.selectByShopId(shopId); - if (Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ + if (Objects.nonNull(systemBuildingShopDO) && Objects.nonNull(systemBuildingShopDO.getSupervisorId())){ EnterpriseUserDO userInfoByJobnumber = enterpriseUserMapper.getUserInfoByJobnumber(systemBuildingShopDO.getSupervisorId()); if (Objects.nonNull(userInfoByJobnumber)){ submitLicenseResponse.setApprover(userInfoByJobnumber.getName()+"_"+userInfoByJobnumber.getJobnumber()); From 04d8b808cb6a2ba9ee0115280bd1c76f67f4efce Mon Sep 17 00:00:00 2001 From: guohb <1808583880@qq.com> Date: Wed, 5 Jun 2024 21:13:34 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=9D=A3=E5=AF=BC?= =?UTF-8?q?=E9=80=BB=E8=BE=91-=E6=98=AF=E5=90=A6=E6=9C=89=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/FirstOrderServiceImp.java | 2 +- .../impl/OpeningOperationPlanImpl.java | 22 ++++++++++++------- .../store/service/impl/PointServiceImpl.java | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) 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 d7c83021b..95ba10339 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 @@ -165,7 +165,7 @@ public class FirstOrderServiceImp implements FirstOrderService { } ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(shopId); EnterpriseUserDO userInfoById = enterpriseUserDAO.getUserInfoById(shopInfo.getSupervisorUserId()); - order.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); + order.setSubmiter(Objects.isNull(userInfoById) ? null : 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 6279a6e37..6fd67d2c9 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 @@ -116,14 +116,20 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { 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()); + List collect = new ArrayList<>(); + if (CollectionUtils.isEmpty(allUserByRoleEnumAndRegionId)){ + collect = null; + }else { + collect = allUserByRoleEnumAndRegionId.stream() + .filter(user -> user.getName() != null) + .map(user -> user.getName() + "_" + user.getJobnumber()) + .collect(Collectors.toList()); + } + if (Objects.nonNull(openingOperationPlanDO)) { openingOperationPlanVO = new OpeningOperationPlanVO(openingOperationPlanDO); - openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); - openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); + openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : 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); @@ -133,8 +139,8 @@ public class OpeningOperationPlanImpl implements OpeningOperationPlanService { openingOperationPlanVO.setShopName(shopInfo.getShopName()); return openingOperationPlanVO; } - openingOperationPlanVO.setSubmiter(userInfoById.getName()+"_"+userInfoById.getJobnumber()); - openingOperationPlanVO.setApprover(collect.stream().collect(Collectors.joining(","))); + openingOperationPlanVO.setSubmiter(Objects.isNull(userInfoById) ? null : userInfoById.getName()+"_"+userInfoById.getJobnumber()); + openingOperationPlanVO.setApprover(CollectionUtils.isEmpty(collect) ? null : collect.stream().collect(Collectors.joining(","))); return openingOperationPlanVO; } 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 a2696744e..3a9accd1a 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 @@ -939,7 +939,7 @@ public class PointServiceImpl implements PointService { ShopInfoDO shopInfo = shopInfoDAO.getShopInfo(rentContract.getShopId()); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(shopInfo.getLineId()); EnterpriseUserDO enterpriseUserDO = enterpriseUserDAO.getUserInfoById(lineInfo.getDevelopmentManager()); - result.setApprover(enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); + result.setApprover(Objects.isNull(enterpriseUserDO) ? null : enterpriseUserDO.getName()+"_"+enterpriseUserDO.getJobnumber()); return result; } From a74fef99b6b05bf7b74aa464f6beda491d0c583b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Wed, 5 Jun 2024 22:55:46 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=BA=97=E9=95=BF=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E4=B8=AD=E6=8B=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/service/impl/TrainingExperienceServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java index a298937fa..eabcedfef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/TrainingExperienceServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import com.cool.store.constants.CommonConstants; import com.cool.store.dao.LineInfoDAO; import com.cool.store.entity.*; import com.cool.store.enums.ErrorCodeEnum; @@ -158,7 +159,7 @@ public class TrainingExperienceServiceImpl extends LineFlowService implements Tr return leaseBaseInfoDO; } List userInfoByUserIds = enterpriseUserMapper.getUserInfoByUserIds(userIdsByMappingIds); - String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.toList()).toString(); + String nameList = userInfoByUserIds.stream().map(EnterpriseUserDO::getName).collect(Collectors.joining(CommonConstants.COMMA)); leaseBaseInfoDO.setStoreManager(nameList); return leaseBaseInfoDO; }