From 3b3880057096be2a9b638628ec04fd62793a51fa Mon Sep 17 00:00:00 2001 From: guohb Date: Wed, 8 May 2024 18:05:23 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BB=BA=E5=BA=97=E9=80=9A=E8=BF=87=E6=8F=92?= =?UTF-8?q?=E5=85=A5=E7=9D=A3=E5=AF=BC=E4=BF=A1=E6=81=AF=202.=E8=AF=81?= =?UTF-8?q?=E7=85=A7=E5=AE=A1=E6=A0=B8=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/dao/RegionDao.java | 3 ++ .../cool/store/mapper/ApplyLicenseMapper.java | 5 ++- .../com/cool/store/mapper/RegionMapper.java | 2 + .../resources/mapper/ApplyLicenseMapper.xml | 9 ++++ .../main/resources/mapper/RegionMapper.xml | 14 +++++++ .../store/service/ApplyLicenseService.java | 2 +- .../service/impl/ApplyLicenseServiceImpl.java | 42 ++++++++++++++----- .../service/impl/SysStoreAppServiceImpl.java | 8 ++-- .../webb/PCApplyLicenseController.java | 6 +-- .../webc/ApplyLicenseController.java | 3 +- 10 files changed, 73 insertions(+), 21 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java index a5ab6ede9..6b3df72c7 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/RegionDao.java @@ -177,4 +177,7 @@ public class RegionDao { return regionMapper.listByThirdRegionType(parentId, thirdRegionType); } + public List getFightRegionByRegionIds(List regionIds) { + return regionMapper.getFightRegionByRegionIds(regionIds); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java index 5af8b80dd..5934f1aa7 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ApplyLicenseMapper.java @@ -1,6 +1,7 @@ package com.cool.store.mapper; import com.cool.store.entity.LicenseTransactDO; +import com.cool.store.entity.RegionDO; import com.cool.store.request.LicenseListRequest; import com.cool.store.response.LicenseListResponse; import org.apache.ibatis.annotations.Param; @@ -10,7 +11,9 @@ import java.util.List; public interface ApplyLicenseMapper extends Mapper { - List licenseList(@Param("request") LicenseListRequest request); + List licenseList(@Param("request") LicenseListRequest request, + @Param("userId") String userId, + @Param("fightRegions") List fightRegions); void updateByShopId(@Param("entity") LicenseTransactDO licenseTransactDO); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java index 0d6772b90..e3c2e7c45 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/RegionMapper.java @@ -102,4 +102,6 @@ public interface RegionMapper { RegionDO getRegionByStoreId(@Param("storeId") String storeId); RegionDO getBigRegionByRegionId(@Param("regionId") long regionId); + + List getFightRegionByRegionIds(@Param("regionIds") List regionIds); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml index b2d918145..e71817b3f 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ApplyLicenseMapper.xml @@ -26,6 +26,15 @@ LEFT JOIN xfsg_shop_info s ON o.shop_id = s.id LEFT JOIN xfsg_line_info l ON l.id = s.line_id + + and s.supervisor_user_id = #{userId} + + + and l.region_id in + + #{regionId} + + AND s.shop_name like concat('%',#{request.storeName},'%') diff --git a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml index 33df6a4f2..3a7bc2e67 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/RegionMapper.xml @@ -374,6 +374,20 @@ WHERE id = #{regionId} ) + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java index bbc4d8aa0..7711e691a 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/ApplyLicenseService.java @@ -27,7 +27,7 @@ public interface ApplyLicenseService { * @param request * @return */ - PageInfo licenseList(LicenseListRequest request); + PageInfo licenseList(LicenseListRequest request,LoginUserInfo user); /** * 证照审核审批 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 d4bc3ce04..bf078e7de 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 @@ -6,18 +6,13 @@ import com.cool.store.context.LoginUserInfo; import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.RegionDao; import com.cool.store.dao.ShopStageInfoDAO; -import com.cool.store.entity.EnterpriseUserDO; -import com.cool.store.entity.LicenseTransactDO; -import com.cool.store.entity.ShopAuditInfoDO; -import com.cool.store.entity.ShopInfoDO; +import com.cool.store.entity.*; import com.cool.store.enums.AuditTypeEnum; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.UserRoleEnum; import com.cool.store.enums.point.ShopSubStageStatusEnum; import com.cool.store.exception.ServiceException; -import com.cool.store.mapper.ApplyLicenseMapper; -import com.cool.store.mapper.EnterpriseUserMapper; -import com.cool.store.mapper.ShopAuditInfoMapper; -import com.cool.store.mapper.ShopInfoMapper; +import com.cool.store.mapper.*; import com.cool.store.request.LicenseListRequest; import com.cool.store.request.SubmitLicenseRequest; import com.cool.store.response.GetStoreInfoByCodeResponse; @@ -76,6 +71,12 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { @Resource PreparationService preparationService; + @Resource + EnterpriseUserRoleMapper enterpriseUserRoleMapper; + + @Resource + UserRegionMappingMapper userRegionMappingMapper; + @Override @Transactional(rollbackFor = Exception.class) public Boolean submitLicense(SubmitLicenseRequest request,LoginUserInfo user) { @@ -145,9 +146,28 @@ public class ApplyLicenseServiceImpl implements ApplyLicenseService { } @Override - public PageInfo licenseList(LicenseListRequest request) { - PageHelper.startPage(request.getPageNum(), request.getPageSize()); - List licenseListResponses = applyLicenseMapper.licenseList(request); + public PageInfo licenseList(LicenseListRequest request,LoginUserInfo user) { + //当前用户角色 + List userRoleIds = enterpriseUserRoleMapper.getUserRoleIds(user.getUserId()); + List licenseListResponses = new ArrayList<>(); + //查证照列表数据 + if (userRoleIds.contains(UserRoleEnum.THEATER_MANAGER.getCode())){ + //当前用户所属区域 + List regionIdsByUserIds = userRegionMappingMapper.getRegionIdsByUserIds(Arrays.asList(user.getUserId())); + List regionIds = regionIdsByUserIds.stream().map(UserRegionMappingDO::getRegionId).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(regionIds)){ + return new PageInfo<>(); + } + List fightRegion = regionDao.getFightRegionByRegionIds(regionIds); + if (CollectionUtils.isEmpty(fightRegion)){ + return new PageInfo<>(); + } + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + licenseListResponses = applyLicenseMapper.licenseList(request,null,fightRegion); + }else { + PageHelper.startPage(request.getPageNum(), request.getPageSize()); + licenseListResponses = applyLicenseMapper.licenseList(request,user.getUserId(),null); + } List userIdList = new ArrayList<>(); for (LicenseListResponse vo : licenseListResponses) { userIdList.add(vo.getSupervisorUserId()); 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 5c40574d7..8af5e8442 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 @@ -418,10 +418,10 @@ public class SysStoreAppServiceImpl implements SysStoreAppService,AuditResultSer shopAuditInfoDO.setRejectReason(request.getCause()); shopSubStageStatusEnum = ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_32; }else if (request.getAuditResult() == Constants.ONE_INTEGER){ - //更新门店编码 - ShopInfoDO shopInfoDO = new ShopInfoDO(); - shopInfoDO.setId(shopId); - shopInfoDO.setStoreNum(request.getStoreNum()); + ShopInfoDO shopInfoDO = shopInfoMapper.selectByPrimaryKey(shopId); + EnterpriseUserDO supervisor = userAuthMappingService.getUserByRoleEnumAndRegionId(UserRoleEnum.SUPERVISION, shopInfoDO.getRegionId()); + shopInfoDO.setStoreNum(request.getStoreNum()); //更新门店编码 + shopInfoDO.setSupervisorUserId(supervisor.getUserId());//更新督导 shopInfoMapper.updateByPrimaryKeySelective(shopInfoDO); shopAuditInfoDO.setResultType(Constants.ZERO_INTEGER); shopAuditInfoDO.setPassReason(request.getCause()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java index 571d52f3a..c93096661 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCApplyLicenseController.java @@ -36,9 +36,9 @@ public class PCApplyLicenseController { @RequestParam(value = "submitEndTime", required = false) Long submitEndTime, @RequestParam(value = "regionId", required = false) String regionId, @RequestParam(value = "status", required = false) Integer status) { - LicenseListRequest request = - new LicenseListRequest(pageNumber, pageSize, storeName, submitStartTime, submitEndTime, regionId, status); - return ResponseResult.success(applyLicenseService.licenseList(request)); + LicenseListRequest request = new LicenseListRequest(pageNumber, pageSize, storeName, submitStartTime, submitEndTime, regionId, status); + LoginUserInfo user = CurrentUserHolder.getUser(); + return ResponseResult.success(applyLicenseService.licenseList(request,user)); } @ApiOperation("证照办理数据回显") diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java index b86d9a5a3..f39b63b7d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ApplyLicenseController.java @@ -4,6 +4,7 @@ import com.cool.store.context.CurrentUserHolder; import com.cool.store.context.LoginUserInfo; import com.cool.store.request.SubmitLicenseRequest; import com.cool.store.response.ResponseResult; +import com.cool.store.response.SubmitLicenseResponse; import com.cool.store.service.ApplyLicenseService; import com.cool.store.service.CoolStoreStartFlowService; import io.swagger.annotations.Api; @@ -36,7 +37,7 @@ public class ApplyLicenseController { @ApiOperation("证照办理数据回显") @GetMapping("/default/get") - public ResponseResult getDefault(@RequestParam("shopId") Long shopId) { + public ResponseResult getDefault(@RequestParam("shopId") Long shopId) { return ResponseResult.success(applyLicenseService.getDefault(shopId)); }