suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
shuo.wang
2025-05-19 18:31:27 +08:00
parent 058a9bc250
commit 0909369e59
3 changed files with 26 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-dao/src/main/java/com/cool/store/dao/AcceptanceInfoDAO.java
View File

@@ -66,6 +66,9 @@ public class AcceptanceInfoDAO {
} }
public Integer initAcceptanceInfo(List<Long> shopIds){ public Integer initAcceptanceInfo(List<Long> shopIds){
if (CollectionUtils.isEmpty(shopIds)){
return CommonConstants.ZERO;
}
return acceptanceInfoMapper.initAcceptanceInfo(shopIds); return acceptanceInfoMapper.initAcceptanceInfo(shopIds);
} }
} }

53
coolstore-partner-service/src/main/java/com/cool/store/service/impl/DataHandlerServerImpl.java
View File

@@ -111,6 +111,9 @@ public class DataHandlerServerImpl implements DataHandlerServer {
Map<String, ShopInfoDO> shopInfoByCodeMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getShopCode, item -> item)); Map<String, ShopInfoDO> shopInfoByCodeMap = shopInfoList.stream().collect(Collectors.toMap(ShopInfoDO::getShopCode, item -> item));
List<Long> shopIds = shopInfoList.stream().map(ShopInfoDO::getId).collect(Collectors.toList()); List<Long> shopIds = shopInfoList.stream().map(ShopInfoDO::getId).collect(Collectors.toList());
List<Long> lineIdList = shopInfoList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList()); List<Long> lineIdList = shopInfoList.stream().map(ShopInfoDO::getLineId).collect(Collectors.toList());
//装修验收数据
List<AcceptanceInfoDO> acceptanceInfoDOList = acceptanceInfoDAO.selectByShopIds(shopIds);
Map<Long, AcceptanceInfoDO> acceptanceInfoMap = acceptanceInfoDOList.stream().collect(Collectors.toMap(AcceptanceInfoDO::getShopId, item -> item));
//手机号 //手机号
Map<Long, String> lineMobileMap = lineInfoDAO.getLineMobileMap(lineIdList); Map<Long, String> lineMobileMap = lineInfoDAO.getLineMobileMap(lineIdList);
@@ -160,6 +163,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
List<Long> fitmentFhopIdList = new ArrayList<>(); List<Long> fitmentFhopIdList = new ArrayList<>();
//建店阶段完成时间 //建店阶段完成时间
List<BuildStageDTO> updateBuildStageList = new ArrayList<>(); List<BuildStageDTO> updateBuildStageList = new ArrayList<>();
//装修验收表需要初始化的门店
List<Long> initFitmentShopIdList = new ArrayList<>();
for (ImportOaOldShopDataDTO dto : list) { for (ImportOaOldShopDataDTO dto : list) {
if (!check(dto, errorList)) { if (!check(dto, errorList)) {
continue; continue;
@@ -248,7 +253,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
signFranchiseDO.setProtectiveDistance((int) Double.parseDouble(dto.getProtectionDistance().trim())); signFranchiseDO.setProtectiveDistance((int) Double.parseDouble(dto.getProtectionDistance().trim()));
} }
ShopStageInfoDO buildStage = bulidStageMap.get(shopId); ShopStageInfoDO buildStage = bulidStageMap.get(shopId);
//建店资料未完成 //建店资料完成时间
BuildStageDTO buildStageDTO = new BuildStageDTO(); BuildStageDTO buildStageDTO = new BuildStageDTO();
buildStageDTO.setShopId(shopId); buildStageDTO.setShopId(shopId);
buildStageDTO.setEndTime(dto.getBuildEndTime() + " 00:00:00"); buildStageDTO.setEndTime(dto.getBuildEndTime() + " 00:00:00");
@@ -336,6 +341,10 @@ public class DataHandlerServerImpl implements DataHandlerServer {
posDO.setCreateTime(new Date()); posDO.setCreateTime(new Date());
addPosAndOrderInfoList.add(posDO); addPosAndOrderInfoList.add(posDO);
} }
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId);
if (Objects.isNull(acceptanceInfoDO)) {
initFitmentShopIdList.add(shopId);
}
} }
shopInfoDAO.updateShopCity(shopInfoList); shopInfoDAO.updateShopCity(shopInfoList);
pointInfoDAO.updateAddress(pointListByIds); pointInfoDAO.updateAddress(pointListByIds);
@@ -346,15 +355,16 @@ public class DataHandlerServerImpl implements DataHandlerServer {
orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList); orderSysInfoDAO.batchInsertSpecific(addOrderSysInfoList);
franchiseFeeDAO.updateBill(franchiseFeeByShopIds); franchiseFeeDAO.updateBill(franchiseFeeByShopIds);
buildInformationDAO.batchInsertSpecific(addBuildList); buildInformationDAO.batchInsertSpecific(addBuildList);
if (CollectionUtils.isNotEmpty(updateBuildStageList)) { //装修表初始化
List<Long> updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList()); acceptanceInfoDAO.initAcceptanceInfo(initFitmentShopIdList);
//pos阶段完成 List<Long> updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList());
shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163); //pos阶段完成
// 订货阶段 完成 shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163);
shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173); // 订货阶段 完成
//数据处理用平台账号 火马，云流水，新掌柜状态改为已完成 shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173);
shopAccountDAO.updateStatusDataHandle(updateStageShopIds); //数据处理用平台账号 火马，云流水，新掌柜状态改为已完成
} shopAccountDAO.updateStatusDataHandle(updateStageShopIds);
//表中4月20号后的数据，数据录入系统，新店装修阶段状态不变更 其他时间的数据状态改为已完成 不包括装修验收 //表中4月20号后的数据，数据录入系统，新店装修阶段状态不变更 其他时间的数据状态改为已完成 不包括装修验收
shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_863); shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_863);
shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91); shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_91);
@@ -731,7 +741,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
if (StringUtil.isNotBlank(dto.getIntroductionAward())) { if (StringUtil.isNotBlank(dto.getIntroductionAward())) {
signFranchiseDO.setIntroductionAward(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()); signFranchiseDO.setContractCode(dto.getContractCode().trim());
} }
if (StringUtil.isNotBlank(dto.getProtectionDistance())) { if (StringUtil.isNotBlank(dto.getProtectionDistance())) {
@@ -951,20 +961,6 @@ public class DataHandlerServerImpl implements DataHandlerServer {
errorList.add(errorDTO); errorList.add(errorDTO);
return false; 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())) { if (StringUtil.isBlank(dto.getContractStartDate())) {
ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO();
errorDTO.setShopCode(dto.getShopCode()); errorDTO.setShopCode(dto.getShopCode());
@@ -1014,13 +1010,6 @@ public class DataHandlerServerImpl implements DataHandlerServer {
errorList.add(errorDTO); errorList.add(errorDTO);
return false; 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())) { if (StringUtil.isBlank(dto.getDeclareGoodsLogisticsWarehouseName())) {
ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO(); ImportOaOldShopDataErrorDTO errorDTO = new ImportOaOldShopDataErrorDTO();
errorDTO.setShopCode(dto.getShopCode()); errorDTO.setShopCode(dto.getShopCode());

5
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/DataHandlerController.java
View File

@@ -69,7 +69,7 @@ public class DataHandlerController {
@PostMapping("/dataStageHandler") @PostMapping("/dataStageHandler")
@ApiOperation("阶段处理") @ApiOperation("阶段处理")
public ResponseResult<Boolean> importOaOldShopData(MultipartFile file, @RequestParam("flag") Boolean flag) { public ResponseResult<Boolean> dataStageHandler(MultipartFile file, @RequestParam("flag") Boolean flag) {
ExcelReader reader = null; ExcelReader reader = null;
try { try {
reader = ExcelUtil.getReader(file.getInputStream()); reader = ExcelUtil.getReader(file.getInputStream());
@@ -101,7 +101,7 @@ public class DataHandlerController {
} }
@PostMapping("/dataHandlerV20241012") @PostMapping("/dataHandlerV20241012")
@ApiOperation("导入OA旧数据") @ApiOperation("导入OA202410-12旧数据")
public ResponseResult<Boolean> dataHandlerV20241012(MultipartFile file) { public ResponseResult<Boolean> dataHandlerV20241012(MultipartFile file) {
ExcelReader reader = null; ExcelReader reader = null;
try { try {
@@ -110,7 +110,6 @@ public class DataHandlerController {
log.error("read file error:", e); log.error("read file error:", e);
} }
assert reader != null; assert reader != null;
log.info("----------------------:{}", file.getOriginalFilename());
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE); List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
ImportTaskDO importTaskDO = new ImportTaskDO(); ImportTaskDO importTaskDO = new ImportTaskDO();
importTaskDO.setFileName(file.getOriginalFilename()); importTaskDO.setFileName(file.getOriginalFilename());