From 8a4dd5693ea79f0f67c26ff69afdf94647d0d83a Mon Sep 17 00:00:00 2001 From: "shuo.wang" Date: Thu, 3 Jul 2025 10:58:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=BC=80=E5=BA=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=94=B9=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/ShopListSuccessOpenRequest.java | 22 +++++++ .../com/cool/store/service/ShopService.java | 2 +- .../store/service/impl/ShopServiceImpl.java | 66 ++++++++++--------- .../store/service/impl/StoreServiceImpl.java | 2 +- .../controller/webc/MiniShopController.java | 10 +-- 5 files changed, 62 insertions(+), 40 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/request/ShopListSuccessOpenRequest.java diff --git a/coolstore-partner-model/src/main/java/com/cool/store/request/ShopListSuccessOpenRequest.java b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopListSuccessOpenRequest.java new file mode 100644 index 000000000..01d68f077 --- /dev/null +++ b/coolstore-partner-model/src/main/java/com/cool/store/request/ShopListSuccessOpenRequest.java @@ -0,0 +1,22 @@ +package com.cool.store.request; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @Author: WangShuo + * @Date: 2025/07/03/10:54 + * @Version 1.0 + * @注释: + */ +@Data +public class ShopListSuccessOpenRequest { + + @NotNull + private Long lineId; + private Integer pageNum = 1; + private Integer pageSize = 10 ; + private String storeName; + +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java index d8b56b806..bc13046c1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ShopService.java @@ -107,7 +107,7 @@ public interface ShopService { Boolean dataHandler(Long shopId); - PageInfo getShopListSuccessOpen(Long lineId,Integer pageNum,Integer pageSize,String storeName); + PageInfo getShopListSuccessOpen(ShopListSuccessOpenRequest request); ShopResponse getShopNameAndCode(Long shopId,Long lineId); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java index 3b503d3d1..c6634f1ee 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopServiceImpl.java @@ -236,16 +236,16 @@ public class ShopServiceImpl implements ShopService { // //进入选址不允许删除操作 // throw new ServiceException(ErrorCodeEnum.NOT_ALLOW_OPERATE); // } - ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_7); - if(ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())){ - throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); - } + ShopStageInfoDO shopSubStageInfo = shopStageInfoDAO.getShopSubStageInfo(shopInfo.getId(), ShopSubStageEnum.SHOP_STAGE_7); + if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_73.getShopSubStageStatus().equals(shopSubStageInfo.getShopSubStageStatus())) { + throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); + } List franchiseFeePayInfoByShopId = linePayDAO.getFranchiseFeePayInfoByShopId(request.getShopId()); - if (ListUtils.emptyIfNull(franchiseFeePayInfoByShopId) - .stream() - .anyMatch(lineInfoDO->lineInfoDO.getXgjClaimStatus().equals(ClaimStatusEnum.CLAIMED.getCode()))){ - throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); - } + if (ListUtils.emptyIfNull(franchiseFeePayInfoByShopId) + .stream() + .anyMatch(lineInfoDO -> lineInfoDO.getXgjClaimStatus().equals(ClaimStatusEnum.CLAIMED.getCode()))) { + throw new ServiceException(ErrorCodeEnum.IS_EXIST_CLAIM); + } // if (Objects.nonNull(shopInfo.getPointId())) { // PointInfoDO pointInfo = pointInfoDAO.getPointInfoById(shopInfo.getPointId()); // if (Objects.nonNull(pointInfo) && SelectStatusEnum.SELECT_STATUS_1.getCode().equals(pointInfo.getSelectStatus())) { @@ -600,14 +600,18 @@ public class ShopServiceImpl implements ShopService { } @Override - public PageInfo getShopListSuccessOpen(Long lineId,Integer pageNum,Integer pageSize,String storeName) { + public PageInfo getShopListSuccessOpen(ShopListSuccessOpenRequest request) { + Long lineId = request.getLineId(); + Integer pageNum = request.getPageNum(); + Integer pageSize = request.getPageSize(); + String storeName = request.getStoreName(); LineInfoDO lineInfoDO = lineInfoDAO.getLineInfo(lineId); - PageInfo storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(),pageNum,pageSize,storeName); - if (CollectionUtils.isEmpty(storeListByMobile.getList())){ + PageInfo storeListByMobile = storeService.getStoreListByMobile(lineInfoDO.getMobile(), pageNum, pageSize, storeName); + if (CollectionUtils.isEmpty(storeListByMobile.getList())) { return new PageInfo<>(); } - for (MiniShopsResponse response : storeListByMobile.getList()){ - response.setYlsCode("ZXA8_"+response.getShopCode()); + for (MiniShopsResponse response : storeListByMobile.getList()) { + response.setYlsCode("ZXA8_" + response.getShopCode()); } return storeListByMobile; } @@ -642,7 +646,7 @@ public class ShopServiceImpl implements ShopService { } } List storeDOS = storeDao.listByMobile(lineInfoDO.getMobile()); - storeDOS.stream().forEach(x->{ + storeDOS.stream().forEach(x -> { ShopNameAndCodeDTO dto = new ShopNameAndCodeDTO(); dto.setShopName(x.getStoreName()); dto.setShopCode(x.getStoreNum()); @@ -662,7 +666,7 @@ public class ShopServiceImpl implements ShopService { )) .values()); response.setShopList(distinctList); - log.info("shopInfo：{}",JSONObject.toJSONString(response)); + log.info("shopInfo：{}", JSONObject.toJSONString(response)); return response; } @@ -685,41 +689,41 @@ public class ShopServiceImpl implements ShopService { List pointListByIds = pointInfoDAO.getPointListByIds(pointIdList); Map pointInfoDOMap = pointListByIds.stream().collect(Collectors.toMap(PointInfoDO::getId, Function.identity())); for (ShopInfoDO shopInfoDO : shopList) { - if (shopInfoDO.getPointId() == null ){ + if (shopInfoDO.getPointId() == null) { continue; } PointInfoDO pointInfoDO = pointInfoDOMap.get(shopInfoDO.getPointId()); - if (pointInfoDO == null ){ + if (pointInfoDO == null) { continue; } shopInfoDO.setProvince(pointInfoDO.getProvince()); shopInfoDO.setCity(pointInfoDO.getCity()); shopInfoDO.setDistrict(pointInfoDO.getDistrict()); } - return shopInfoDAO.updateShopCity(shopList); + return shopInfoDAO.updateShopCity(shopList); } @Override - public List getIntendSubStageHandle(Long lineId,Integer subStage) { + public List getIntendSubStageHandle(Long lineId, Integer subStage) { //查询线索 LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); List userList = new ArrayList<>(); //如果阶段对应不上 直接返回空 - if(!lineInfo.getWorkflowSubStage().equals(subStage)){ + if (!lineInfo.getWorkflowSubStage().equals(subStage)) { return userList; } //加盟商处理时子阶段状态 List intendPartnerList = Arrays.asList(INTENT_0.getCode(), PAY_DEPOSIT_45.getCode()); - if (intendPartnerList.contains(lineInfo.getWorkflowSubStageStatus())){ + if (intendPartnerList.contains(lineInfo.getWorkflowSubStageStatus())) { UserDTO userDTO = new UserDTO(lineInfo.getUsername(), lineInfo.getMobile()); userList.add(userDTO); return userList; } //督导处理阶段 - List intendManagerList = Arrays.asList(INTENT_5.getCode(), PAY_DEPOSIT_50.getCode(),SIGN_INTENT_AGREEMENT_70.getCode()); - if (intendManagerList.contains(lineInfo.getWorkflowSubStageStatus())){ + List intendManagerList = Arrays.asList(INTENT_5.getCode(), PAY_DEPOSIT_50.getCode(), SIGN_INTENT_AGREEMENT_70.getCode()); + if (intendManagerList.contains(lineInfo.getWorkflowSubStageStatus())) { EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(lineInfo.getInvestmentManager()); - if (Objects.nonNull(userInfo)){ + if (Objects.nonNull(userInfo)) { UserDTO userDTO = new UserDTO(userInfo.getName(), userInfo.getMobile()); userList.add(userDTO); } @@ -786,7 +790,7 @@ public class ShopServiceImpl implements ShopService { case SHOP_SUB_STAGE_STATUS_85: return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, JOIN_OFFICE), shopInfo.getRegionId()); - // case SHOP_SUB_STAGE_STATUS_72: + // case SHOP_SUB_STAGE_STATUS_72: case SHOP_SUB_STAGE_STATUS_83: return getUsersByRolesAndRegion(Arrays.asList(REGION_OFFICE, BRANCH_OFFICE), shopInfo.getRegionId()); @@ -815,7 +819,7 @@ public class ShopServiceImpl implements ShopService { return getUsersByRoleAndRegion(UserRoleEnum.LOGISTICS, shopInfo.getRegionId()); case SHOP_SUB_STAGE_STATUS_152: - UserRoleEnum financeRole = JoinModeEnum.OWN_STORE.getCode()==shopInfo.getJoinMode() + UserRoleEnum financeRole = JoinModeEnum.OWN_STORE.getCode() == shopInfo.getJoinMode() ? UserRoleEnum.OWN_SHOP_OFFICE : UserRoleEnum.FINANCE; return getUsersByRole(financeRole); @@ -868,12 +872,12 @@ public class ShopServiceImpl implements ShopService { @Override public ShopStageInfoVO getShopStageStatus(Long shopId, Integer subStage) { - if(shopId == null|| subStage == null ){ + if (shopId == null || subStage == null) { throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); } ShopStageInfoDO stage = shopStageInfoDAO.getByShopIdAndSubStage(shopId, subStage); - if (stage!=null){ - return new ShopStageInfoVO(stage.getShopStage(), stage.getShopSubStage(), stage.getShopSubStageStatus(),stage.getIsTerminated()); + if (stage != null) { + return new ShopStageInfoVO(stage.getShopStage(), stage.getShopSubStage(), stage.getShopSubStageStatus(), stage.getIsTerminated()); } return null; } @@ -902,7 +906,7 @@ public class ShopServiceImpl implements ShopService { private List getUsersByRole(UserRoleEnum role) { SysRoleRequest request = new SysRoleRequest(); request.setRoleName(role.getDesc()); - return convertToUserDTOs(userAuthMappingService.findUserListByRole(request,false)); + return convertToUserDTOs(userAuthMappingService.findUserListByRole(request, false)); } private List getUsersByRoleAndRegion(UserRoleEnum role, Long regionId) { diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java index b4c2aa031..5176a0742 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/StoreServiceImpl.java @@ -82,7 +82,7 @@ public class StoreServiceImpl implements StoreService { List sysRoleDOS = roleIds.stream().filter(role -> "store_inside".equals(role.getPositionType())).collect(Collectors.toList()); List regionIds = new ArrayList<>(); if (CollectionUtils.isNotEmpty(sysRoleDOS)){ - //获取用户管辖门店 + //获取用户管辖区域 List userAuthMapping = userAuthMappingService.listUserAuthMappingByUserId(enterpriseUserDO.getUserId()); if (CollectionUtils.isNotEmpty(userAuthMapping)){ regionIds.addAll(userAuthMapping.stream().map(UserAuthMappingDO::getMappingId).collect(Collectors.toList())); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java index 4425a26e7..e0e2d1a1b 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopController.java @@ -116,13 +116,9 @@ public class MiniShopController { return ResponseResult.success(pointService.updateRentContract(request)); } @ApiOperation("成功开店的门店") - @GetMapping("/getShopListSuccessOpen") - public ResponseResult> getShopListSuccessOpen(@RequestParam("lineId")Long lineId, - @RequestParam(value = "pageSize",defaultValue = "10")Integer pageSize, - @RequestParam(value = "pageNum",defaultValue = "1")Integer pageNum, - @RequestParam(value = "storeName",required = false,defaultValue = "") String storeName - ) { - return ResponseResult.success(shopService.getShopListSuccessOpen(lineId,pageNum,pageSize,storeName)); + @PostMapping("/getShopListSuccessOpen") + public ResponseResult> getShopListSuccessOpen(@RequestBody @Validated ShopListSuccessOpenRequest request ) { + return ResponseResult.success(shopService.getShopListSuccessOpen(request)); } @ApiOperation("获取推荐铺位和我创建的")