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

推数数据云流水账号加前缀

Browse Source
This commit is contained in:
shuo.wang
2025-05-16 17:18:21 +08:00
parent 4227ad9d45
commit 4d37951e46
1 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,7 +592,8 @@ public class DataHandlerServerImpl implements DataHandlerServer {
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());
//装修验收数据 //装修验收数据
acceptanceInfoDAO.selectByShopIds(shopIds); 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);
//铺位列表 //铺位列表
@@ -637,10 +638,18 @@ public class DataHandlerServerImpl implements DataHandlerServer {
//pos系统 //pos系统
List<PosAndOrderInfoDO> posSysInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.POS.getCode()); List<PosAndOrderInfoDO> posSysInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.POS.getCode());
Map<Long, PosAndOrderInfoDO> posSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity())); Map<Long, PosAndOrderInfoDO> posSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
//新发系统
List<PosAndOrderInfoDO> xfSysDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.XIN_FA_SYS.getCode());
Map<Long, PosAndOrderInfoDO> xfSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
//营帐通系统
List<PosAndOrderInfoDO> tentPassInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.TENT_PASS.getCode());
Map<Long, PosAndOrderInfoDO> tentPassInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
//装修阶段需要变更的shopId //装修阶段需要变更的shopId
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;
@@ -744,9 +753,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
preparationService.selectSiteAndBuildStoreComplete(shopId); preparationService.selectSiteAndBuildStoreComplete(shopId);
preparationService.buildStoreComplete(shopId); preparationService.buildStoreComplete(shopId);
} }
if (buildEndTime.before(new Date(1745164800000L))) { fitmentFhopIdList.add(shopId);
fitmentFhopIdList.add(shopId);
}
BuildInformationDO buildInformationDO = buildInformationMap.get(shopId); BuildInformationDO buildInformationDO = buildInformationMap.get(shopId);
if (Objects.isNull(buildInformationDO)) { if (Objects.isNull(buildInformationDO)) {
addBuildList.add(shopId); addBuildList.add(shopId);
@@ -817,6 +824,25 @@ public class DataHandlerServerImpl implements DataHandlerServer {
posDO.setCreateTime(new Date()); posDO.setCreateTime(new Date());
addPosAndOrderInfoList.add(posDO); addPosAndOrderInfoList.add(posDO);
} }
//xf
//订货系统
PosAndOrderInfoDO xf = orderSysInfoDOMap.get(shopId);
if (StringUtil.isNotBlank(dto.getYlsAccount())) {
if (Objects.isNull(order)) {
order = new PosAndOrderInfoDO();
order.setShopId(shopId);
order.setType(PosAndOrderEnum.ORDER.getCode());
order.setRemark("已为您开通订货系统账号和密码，密码已加密，初始密码为888888，可通过加盟小程序修改密码！");
order.setAccount(dto.getYlsAccount().trim());
order.setPassword("888888");
order.setCreateTime(new Date());
addPosAndOrderInfoList.add(order);
}
}
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId);
if (Objects.isNull(acceptanceInfoDO)){
initFitmentShopIdList.add(shopId);
}
} }
shopInfoDAO.updateShopCity(shopInfoList); shopInfoDAO.updateShopCity(shopInfoList);
pointInfoDAO.updateAddress(pointListByIds); pointInfoDAO.updateAddress(pointListByIds);