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 fcaa1d3af..7a9d81b78 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 @@ -234,6 +234,7 @@ public enum ErrorCodeEnum { STATUS_NOT_SUPPORT_SUMMIT(121006,"该状态不支持提交",null), DESIGN_NO_COMPLETE(121007,"请先完成设计阶段!",null), SIGN_COMPLETED(121008,"你已完成验收,无需重复操作!",null), + SHOP_CODE_EXIST(121009,"存在重复门店编码,请联系CRM工作人员处理",null), UPDATE_FAIL(131000,"修改失败,表单不存在!",null), LICENSE_LEGAL_STAGE_FAIL(131001,"营业执照阶段未上传!",null), diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index 3390b1c41..88c7b93b8 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -339,4 +339,7 @@ public class ShopInfoDAO { example.createCriteria().andEqualTo("shopCode", shopCode); return shopInfoMapper.selectOneByExample(example); } + public Integer getNumByShopCode(String shopCode){ + return shopInfoMapper.getNumByShopCode(shopCode); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index bb65e1e57..bbb859a1c 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -146,4 +146,5 @@ public interface ShopInfoMapper extends Mapper { List selectIsCreateStore(); Integer updateManagerRegionId(@Param("list") List shopList); + Integer getNumByShopCode(@Param("shopCode") String shopCode); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 940e2ca6e..2169654b3 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -559,6 +559,9 @@ and b.is_delete = 'effective' and a.region_id != 459 + diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java index 38fa27a1c..836659137 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationDesignInfoServiceImpl.java @@ -43,6 +43,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignDesigner(AssignDesignerRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -76,6 +80,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitDesignDrawing(SubmitDesignDrawingRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -102,6 +110,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean assignQuotation(AssignQuotationRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -125,6 +137,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitQuotationSheet(SubmitQuotationSheetRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -152,6 +168,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean submitConstructionOrder(ConstructionOrderRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -174,6 +194,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean entryConfirmation(EntryConfirmationRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -195,6 +219,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean constructionCompleted(ConstructionCompletedRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -216,6 +244,10 @@ public class DecorationDesignInfoServiceImpl implements DecorationDesignInfoServ @Override @Transactional(rollbackFor = Exception.class) public Boolean decorationAcceptance(HqtDecorationAcceptanceRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null) { throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java index 350aaf141..2e263763d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DecorationMeasureServiceImpl.java @@ -179,6 +179,10 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean assignSurveyors(AssignSurveyorsRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST); @@ -225,6 +229,10 @@ public class DecorationMeasureServiceImpl implements DecorationMeasureService { @Override public Boolean submitMeasurementDiagram(SubmitMeasurementRequest request) { + Integer numByShopCode = shopInfoDAO.getNumByShopCode(request.getShopCode()); + if(numByShopCode > 1){ + throw new ServiceException(ErrorCodeEnum.SHOP_CODE_EXIST); + } ShopInfoDO shopInfoDO = shopInfoDAO.getShopInfoByShopCode(request.getShopCode()); if (shopInfoDO == null){ throw new ServiceException(ErrorCodeEnum.SHOP_NOT_EXIST);