From a03c6953b4f107ad0722e68cba900832a3d023cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Tue, 26 Mar 2024 11:29:22 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=8D=E7=82=B9=E5=9F=8E=E5=B8=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cool/store/dao/HyOpenAreaInfoDAO.java | 5 +- .../store/mapper/HyOpenAreaInfoMapper.java | 2 +- .../resources/mapper/HyOpenAreaInfoMapper.xml | 14 ++- .../java/com/cool/store/dto/OpenCityDTO.java | 21 +++++ .../cool/store/entity/HyOpenAreaInfoDO.java | 2 + .../java/com/cool/store/vo/LineInfoVO.java | 3 + .../java/com/cool/store/vo/OpenAreaVO.java | 3 + .../cool/store/service/OpenAreaService.java | 10 ++- .../service/impl/OpenAreaServiceImpl.java | 18 +++- .../com/cool/store/utils/poi/ExcelUtil.java | 6 +- .../controller/webb/OpenAreaController.java | 8 +- .../webc/MiniOpenAreaController.java | 10 ++- .../store/controller/webc/TestController.java | 89 +++++++++++++++++-- 13 files changed, 171 insertions(+), 20 deletions(-) create mode 100644 coolstore-partner-model/src/main/java/com/cool/store/dto/OpenCityDTO.java diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java index 710657010..b06d40779 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/HyOpenAreaInfoDAO.java @@ -10,6 +10,7 @@ import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; import javax.annotation.Resource; @@ -29,8 +30,8 @@ public class HyOpenAreaInfoDAO { @Resource HyOpenAreaInfoMapper hyOpenAreaInfoMapper; - public List queryKeyOpenArea(){ - return hyOpenAreaInfoMapper.queryKeyOpenArea(); + public List queryKeyOpenArea(String keyword,Integer keyOpenStatus){ + return hyOpenAreaInfoMapper.queryKeyOpenArea( keyword, keyOpenStatus); } public List queryByKeyword(String keyword,Boolean applyFlag,String areaStatus,Boolean filterData){ diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java index 14292b821..e4aea5f83 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyOpenAreaInfoMapper.java @@ -29,7 +29,7 @@ public interface HyOpenAreaInfoMapper { * 查询重点城市 * @return */ - List queryKeyOpenArea(); + List queryKeyOpenArea(@Param("keyword") String keyword,@Param("keyOpenStatus") Integer keyOpenStatus); /** diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml index bf291be37..0faebdced 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml @@ -26,6 +26,9 @@ insert into xfsg_open_area_info + + id, + parent_id, @@ -58,6 +61,9 @@ + + #{record.id}, + #{record.parentId}, @@ -185,8 +191,12 @@ select * from xfsg_open_area_info where area_status = 'keyOpen' - and province_city_flag = 1 - and parent_id is not null + + and area_name like CONCAT('%',#{keyword},'%') + + + and key_open_status = #{keyOpenStatus} + + + \ No newline at end of file diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java index fc25bb596..c6b522ebf 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/OpenAreaService.java @@ -61,6 +61,23 @@ public interface OpenAreaService { * @return */ PageInfo franchisableProvinces(Integer pageSize, Integer pageNumber); + + /** + * 删除重点城市 将重点城市状态改为open + * @param id + * @return + */ + Boolean deleteKeyCity(Long id); + + /** + * 启用 or 禁用 + * @param id + * @param keyOpenStatus + * @return + */ + Boolean updateKeyCityStatus(Long id,Integer keyOpenStatus); + + /** * V1.4 * 意向区域添加不限 diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java index cc9f53e2b..13f70a1d5 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/OpenAreaServiceImpl.java @@ -7,6 +7,9 @@ import com.cool.store.dao.EnterpriseUserDAO; import com.cool.store.dao.HyOpenAreaInfoDAO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.entity.HyOpenAreaInfoDO; +import com.cool.store.enums.AreaStatusEnum; +import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.exception.ServiceException; import com.cool.store.mapper.HyOpenAreaInfoMapper; import com.cool.store.request.OpenAreaRequest; import com.cool.store.service.OpenAreaService; @@ -192,6 +195,28 @@ public class OpenAreaServiceImpl implements OpenAreaService { return hyOpenAreaInfoDOPageInfo; } + @Override + public Boolean deleteKeyCity(Long id) { + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(id); + if (hyOpenAreaInfoDO==null){ + throw new ServiceException(ErrorCodeEnum.OPEN_AREA_IS_NOT_EXISTS); + } + hyOpenAreaInfoDO.setAreaStatus(AreaStatusEnum.OPEN.getCode()); + hyOpenAreaInfoDAO.updateByPrimaryKeySelective(hyOpenAreaInfoDO); + return Boolean.TRUE; + } + + @Override + public Boolean updateKeyCityStatus(Long id, Integer keyOpenStatus) { + HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(id); + if (hyOpenAreaInfoDO==null){ + throw new ServiceException(ErrorCodeEnum.OPEN_AREA_IS_NOT_EXISTS); + } + hyOpenAreaInfoDO.setKeyOpenStatus(keyOpenStatus); + hyOpenAreaInfoDAO.updateByPrimaryKeySelective(hyOpenAreaInfoDO); + return Boolean.TRUE; + } + @Override public Boolean addOpenArea() { diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java index c2e90467f..f5ab3f0ab 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenAreaController.java @@ -78,4 +78,22 @@ public class OpenAreaController { return ResponseResult.success(openAreaService.queryKeyOpenAreaList(pageSize,pageNumber,keyword,status)); } + @GetMapping(path = "/updateKeyCityStatus") + @ApiOperation("启用或者禁用重点城市") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "区域ID", required = true), + @ApiImplicitParam(name = "keyOpenStatus", value = "启用或者禁用 启用-0 禁用-1", required = true) + }) + public ResponseResult getKeyOpenAreaList(@RequestParam(value = "id",required = false)Long id, + @RequestParam(value = "keyOpenStatus",required = false)Integer keyOpenStatus ){ + return ResponseResult.success(openAreaService.updateKeyCityStatus(id,keyOpenStatus)); + } + + + @GetMapping(path = "/deleteKeyCity") + @ApiOperation("删除重点城市") + public ResponseResult getKeyOpenAreaList(@RequestParam(value = "id",required = false)Long id){ + return ResponseResult.success(openAreaService.deleteKeyCity(id)); + } + }