diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/AreaStatusEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/AreaStatusEnum.java
index a2c11fed1..360f94192 100644
--- a/coolstore-partner-common/src/main/java/com/cool/store/enums/AreaStatusEnum.java
+++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/AreaStatusEnum.java
@@ -9,8 +9,6 @@ public enum AreaStatusEnum {
OPEN("open","开放"),
- NOT_OPEN("notOpen","未开放"),
- SATURATED("saturated","已饱和"),
KEY_OPEN("keyOpen","重点开放"),
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 92465f730..38018cdc8 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
@@ -131,6 +131,9 @@ public enum ErrorCodeEnum {
EXHIBITION_NOT_SIGNED(106004, "线索未进行会销签到", null),
EXHIBITION_NOT_SUBMIT_INTENTION(106005, "线索未提交意向申请", null),
EXHIBITION_LINE_INTERVIEWED(106006, "线索已预约面审", null),
+
+
+ OPEN_AREA_IS_NOT_EXISTS(107006, "意向区域城市不存在", null),
;
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 b06d40779..44ddae98e 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
@@ -157,4 +157,9 @@ public class HyOpenAreaInfoDAO {
}
return hyOpenAreaInfoMapper.selectByAreaPath(areaPath);
}
+
+ public int updateByPrimaryKeySelective(HyOpenAreaInfoDO hyOpenAreaInfoDO){
+ return hyOpenAreaInfoMapper.updateByPrimaryKeySelective( hyOpenAreaInfoDO);
+ }
+
}
diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
index 0faebdced..f15afeae2 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml
@@ -129,6 +129,9 @@
update_user_id = #{record.updateUserId},
+
+ key_open_status = #{record.keyOpenStatus},
+
where id = #{record.id}
@@ -312,4 +315,6 @@
WHERE deleted=0 and province_city_flag = 1 and parent_id is not null
+
+
\ 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));
+ }
+
}