diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java index 9c18fb3d6..eba2551ea 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java @@ -66,6 +66,9 @@ public class AcceptanceInfoDAO { } public Integer initAcceptanceInfo(List shopIds){ + if (CollectionUtils.isEmpty(shopIds)){ + return CommonConstants.ZERO; + } return acceptanceInfoMapper.initAcceptanceInfo(shopIds); } } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java index a067d4977..62b6358d2 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java @@ -111,6 +111,9 @@ public class DataHandlerServerImpl implements DataHandlerServer { Map shopInfoByCodeMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getShopCode, item -> item)); List shopIds = shopInfoList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); List lineIdList = shopInfoList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList()); + //装修验收数据 + List acceptanceInfoDOList = acceptanceInfoDAO.selectByShopIds(shopIds); + Map acceptanceInfoMap = acceptanceInfoDOList.stream().collect(Collectors.toMap(AcceptanceInfoDO::getShopId, item -> item)); //手机号 Map lineMobileMap = lineInfoDAO.getLineMobileMap(lineIdList); @@ -160,6 +163,8 @@ public class DataHandlerServerImpl implements DataHandlerServer { List fitmentFhopIdList = new ArrayList<>(); //建店阶段完成时间 List updateBuildStageList = new ArrayList<>(); + //装修验收表需要初始化的门店 + List initFitmentShopIdList = new ArrayList<>(); for (ImportOaOldShopDataDTO dto : list) { if (!check(dto, errorList)) { continue; @@ -248,7 +253,7 @@ public class DataHandlerServerImpl implements DataHandlerServer { signFranchiseDO.setProtectiveDistance((int) Double.parseDouble(dto.getProtectionDistance().trim())); } ShopStageInfoDO buildStage = bulidStageMap.get(shopId); - //建店资料未完成 + //建店资料完成时间 BuildStageDTO buildStageDTO = new BuildStageDTO(); buildStageDTO.setShopId(shopId); buildStageDTO.setEndTime(dto.getBuildEndTime() + " 00:00:00"); @@ -336,6 +341,10 @@ public class DataHandlerServerImpl implements DataHandlerServer { posDO.setCreateTime(new Date()); addPosAndOrderInfoList.add(posDO); } + AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId); + if (Objects.isNull(acceptanceInfoDO)) { + initFitmentShopIdList.add(shopId); + } } shopInfoDAO.updateShopCity(shopInfoList); pointInfoDAO.updateAddress(pointListByIds); @@ -346,15 +355,16 @@ public class DataHandlerServerImpl implements DataHandlerServer { orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList); franchiseFeeDAO.updateBill(franchiseFeeByShopIds); buildInformationDAO.batchInsertSpecific(addBuildList); - if (CollectionUtils.isNotEmpty(updateBuildStageList)) { - List updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList()); - //pos阶段完成 - shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163); - // 订货阶段 完成 - shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173); - //数据处理用平台账号 火马,云流水,新掌柜状态改为已完成 - shopAccountDAO.updateStatusDataHandle(updateStageShopIds); - } + //装修表初始化 + acceptanceInfoDAO.initAcceptanceInfo(initFitmentShopIdList); + List updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList()); + //pos阶段完成 + shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163); + // 订货阶段 完成 + shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173); + //数据处理用平台账号 火马,云流水,新掌柜状态改为已完成 + shopAccountDAO.updateStatusDataHandle(updateStageShopIds); + //表中4月20号后的数据,数据录入系统,新店装修阶段状态不变更 其他时间的数据状态改为已完成 不包括装修验收 shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_863); shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91); @@ -731,7 +741,7 @@ public class DataHandlerServerImpl implements DataHandlerServer { if (StringUtil.isNotBlank(dto.getIntroductionAward())) { signFranchiseDO.setIntroductionAward(dto.getIntroductionAward()); } - if (StringUtil.isNotBlank(dto.getContractCode()) && dto.getContractCode().trim().startsWith("ZX") && dto.getContractCode().trim() != "0") { + if (StringUtil.isNotBlank(dto.getContractCode()) && dto.getContractCode().trim().startsWith("ZX") && !"0".equals(dto.getContractCode().trim())) { signFranchiseDO.setContractCode(dto.getContractCode().trim()); } if (StringUtil.isNotBlank(dto.getProtectionDistance())) { @@ -951,20 +961,6 @@ public class DataHandlerServerImpl implements DataHandlerServer { errorList.add(errorDTO); return false; } - if (StringUtil.isBlank(dto.getMonthRent())) { - ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); - errorDTO.setShopCode(dto.getShopCode()); - errorDTO.setErrorReason("租金不能为空"); - errorList.add(errorDTO); - return false; - } - if (StringUtil.isBlank(dto.getPointArea())) { - ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); - errorDTO.setShopCode(dto.getShopCode()); - errorDTO.setErrorReason("场地实际面积不能为空"); - errorList.add(errorDTO); - return false; - } if (StringUtil.isBlank(dto.getContractStartDate())) { ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); errorDTO.setShopCode(dto.getShopCode()); @@ -1014,13 +1010,6 @@ public class DataHandlerServerImpl implements DataHandlerServer { errorList.add(errorDTO); return false; } - if (StringUtil.isBlank(dto.getDiscountReason())) { - ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); - errorDTO.setShopCode(dto.getShopCode()); - errorDTO.setErrorReason("加盟费优惠原因不能为空"); - errorList.add(errorDTO); - return false; - } if (StringUtil.isBlank(dto.getDeclareGoodsLogisticsWarehouseName())) { ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); errorDTO.setShopCode(dto.getShopCode()); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java index 6a997d84e..48bc5bbb2 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java @@ -69,7 +69,7 @@ public class DataHandlerController { @PostMapping("/dataStageHandler") @ApiOperation("阶段处理") - public ResponseResult importOaOldShopData(MultipartFile file, @RequestParam("flag") Boolean flag) { + public ResponseResult dataStageHandler(MultipartFile file, @RequestParam("flag") Boolean flag) { ExcelReader reader = null; try { reader = ExcelUtil.getReader(file.getInputStream()); @@ -101,7 +101,7 @@ public class DataHandlerController { } @PostMapping("/dataHandlerV20241012") - @ApiOperation("导入OA旧数据") + @ApiOperation("导入OA202410-12旧数据") public ResponseResult dataHandlerV20241012(MultipartFile file) { ExcelReader reader = null; try { @@ -110,7 +110,6 @@ public class DataHandlerController { log.error("read file error:", e); } assert reader != null; - log.info("----------------------:{}", file.getOriginalFilename()); List> dataMapList = reader.read(0, 1, Integer.MAX_VALUE); ImportTaskDO importTaskDO = new ImportTaskDO(); importTaskDO.setFileName(file.getOriginalFilename());