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 13:55:53 +08:00
parent 4d37951e46
commit 058a9bc250
4 changed files with 74 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coolstore-partner-common/src/main/java/com/cool/store/enums/FileTypeEnum.java
View File

@@ -21,7 +21,7 @@ public enum FileTypeEnum {
IMPORT_OA_OLD_SHOP_DATA_ERROR("OaOldShopDataError", "导入OA旧数据错误列表"), IMPORT_OA_OLD_SHOP_DATA_ERROR("OaOldShopDataError", "导入OA旧数据错误列表"),
IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"), IMPORT_OA_OLD_SHOP_DATA("importOaOldShopData", "导入OA旧数据"),
ZXJP_OPEN_SHOP_REPORT("zxjpOpenShopReport","正新鸡排开店"), ZXJP_OPEN_SHOP_REPORT("zxjpOpenShopReport","正新鸡排开店"),
IMPORT_OA_OLD_SHOP_STAGE_DATA("importOaOldShopStageData", "导入OA旧数据"), IMPORT_OA_OLD_SHOP_STAGE_DATA("importOaOldShopStageData", "导入OA旧阶段数据"),
IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"), IMPORT_OA_OLD_SHOP_STAGE_DATA_ERROR("OaOldShopStageDataError", "导入OA旧数据阶段错误列表"),
; ;
private String fileType; private String fileType;

2
coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml
View File

@@ -192,7 +192,7 @@
<foreach collection="list" item="shopId" open="(" close=")" separator=","> <foreach collection="list" item="shopId" open="(" close=")" separator=",">
#{shopId} #{shopId}
</foreach> </foreach>
and system_name in ('火码POS','云流水','新掌柜') and system_name in ('火码POS','云流水','新掌柜') and status !=5
</update> </update>

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

@@ -548,15 +548,15 @@ public class DataHandlerServerImpl implements DataHandlerServer {
List<Long> allShopIds = acceptanceInfoDAO.getAllShopIds(); List<Long> allShopIds = acceptanceInfoDAO.getAllShopIds();
//需要处理的门店 //需要处理的门店
List<Long> addShopIds = new ArrayList<>(); List<Long> addShopIds = new ArrayList<>();
for (ShopStageInfoDO subStage : subStages){ for (ShopStageInfoDO subStage : subStages) {
if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())){ if (ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112.getShopSubStageStatus().equals(subStage.getShopSubStageStatus())) {
if (!allShopIds.contains(subStage.getShopId())){ if (!allShopIds.contains(subStage.getShopId())) {
addShopIds.add(subStage.getShopId()); addShopIds.add(subStage.getShopId());
} }
} }
} }
if (CollectionUtils.isEmpty(addShopIds)){ if (CollectionUtils.isEmpty(addShopIds)) {
throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); throw new ServiceException(ErrorCodeEnum.PARAMS_VALIDATE_ERROR);
} }
acceptanceInfoDAO.initAcceptanceInfo(addShopIds); acceptanceInfoDAO.initAcceptanceInfo(addShopIds);
return true; return true;
@@ -574,7 +574,7 @@ public class DataHandlerServerImpl implements DataHandlerServer {
ImportOaOldShopDataDTO dto = buildColumn(data); ImportOaOldShopDataDTO dto = buildColumn(data);
list.add(dto); list.add(dto);
} catch (Exception e) { } catch (Exception e) {
log.info("importOaOldShopData 转化dto error:{}", JSONObject.toJSONString(data)); log.info("dataHandlerV20241012 转化dto error:{}", JSONObject.toJSONString(data));
} }
}); });
log.info("导入数据条数:{}", list.size()); log.info("导入数据条数:{}", list.size());
@@ -640,10 +640,10 @@ public class DataHandlerServerImpl implements DataHandlerServer {
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()); List<PosAndOrderInfoDO> xfSysDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.XIN_FA_SYS.getCode());
Map<Long, PosAndOrderInfoDO> xfSysInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity())); Map<Long, PosAndOrderInfoDO> xfSysInfoDOMap = xfSysDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
//营帐通系统 //营帐通系统
List<PosAndOrderInfoDO> tentPassInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.TENT_PASS.getCode()); List<PosAndOrderInfoDO> tentPassInfoDOList = posAndOrderInfoDAO.selectListByShopIdAndType(shopIds, PosAndOrderEnum.TENT_PASS.getCode());
Map<Long, PosAndOrderInfoDO> tentPassInfoDOMap = posSysInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity())); Map<Long, PosAndOrderInfoDO> tentPassInfoDOMap = tentPassInfoDOList.stream().collect(Collectors.toMap(PosAndOrderInfoDO::getShopId, Function.identity()));
//装修阶段需要变更的shopId //装修阶段需要变更的shopId
List<Long> fitmentFhopIdList = new ArrayList<>(); List<Long> fitmentFhopIdList = new ArrayList<>();
//建店阶段完成时间 //建店阶段完成时间
@@ -825,22 +825,28 @@ public class DataHandlerServerImpl implements DataHandlerServer {
addPosAndOrderInfoList.add(posDO); addPosAndOrderInfoList.add(posDO);
} }
//xf //xf
//订货系统 PosAndOrderInfoDO xf = xfSysInfoDOMap.get(shopId);
PosAndOrderInfoDO xf = orderSysInfoDOMap.get(shopId); if (Objects.isNull(xf)) {
if (StringUtil.isNotBlank(dto.getYlsAccount())) { order = new PosAndOrderInfoDO();
if (Objects.isNull(order)) { order.setShopId(shopId);
order = new PosAndOrderInfoDO(); order.setType(PosAndOrderEnum.XIN_FA_SYS.getCode());
order.setShopId(shopId); order.setRemark("已为您开通信发系统账号和授权码请妥善保管");
order.setType(PosAndOrderEnum.ORDER.getCode()); order.setAccount(dto.getShopCode().trim());
order.setRemark("已为您开通订货系统账号和密码，密码已加密，初始密码为888888，可通过加盟小程序修改密码！"); order.setCreateTime(new Date());
order.setAccount(dto.getYlsAccount().trim()); addPosAndOrderInfoList.add(order);
order.setPassword("888888"); }
order.setCreateTime(new Date()); //营帐通
addPosAndOrderInfoList.add(order); PosAndOrderInfoDO yzt = tentPassInfoDOMap.get(shopId);
} if (Objects.isNull(yzt)) {
order = new PosAndOrderInfoDO();
order.setShopId(shopId);
order.setType(PosAndOrderEnum.TENT_PASS.getCode());
order.setRemark("已为您开通营帐通");
order.setCreateTime(new Date());
addPosAndOrderInfoList.add(order);
} }
AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId); AcceptanceInfoDO acceptanceInfoDO = acceptanceInfoMap.get(shopId);
if (Objects.isNull(acceptanceInfoDO)){ if (Objects.isNull(acceptanceInfoDO)) {
initFitmentShopIdList.add(shopId); initFitmentShopIdList.add(shopId);
} }
} }
@@ -853,21 +859,28 @@ 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());
List<Long> updateStageShopIds = updateBuildStageList.stream().map(BuildStageDTO::getShopId).collect(Collectors.toList()); //pos阶段完成
//pos阶段完成 shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163);
shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_163); //xf
// 订货阶段 完成 shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_235);
shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173); //yzt
//数据处理用平台账号 火马，云流水，新掌柜状态改为已完成 shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_245);
shopAccountDAO.updateStatusDataHandle(updateStageShopIds); // 订货阶段 完成
} shopStageInfoDAO.dataUpdateStatus(updateStageShopIds, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_173);
//表中4月20号后的数据，数据录入系统，新店装修阶段状态不变更 其他时间的数据状态改为已完成 不包括装修验收 //数据处理用平台账号 火马，云流水，新掌柜状态改为已完成
shopAccountDAO.updateStatusDataHandle(updateStageShopIds);
//装修stage
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);
shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112); shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_112);
//装修验收初始化 shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_123);
shopStageInfoDAO.dataUpdateAcceptanceStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_121); //train
shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_51);
//openPlan
shopStageInfoDAO.dataUpdateStatus(fitmentFhopIdList, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_143);
//装修表初始化
acceptanceInfoDAO.initAcceptanceInfo(initFitmentShopIdList);
if (!errorList.isEmpty()) { if (!errorList.isEmpty()) {
task.setStatus(ImportTaskStatusEnum.ERROR.getCode()); task.setStatus(ImportTaskStatusEnum.ERROR.getCode());
String url = null; String url = null;

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

@@ -99,4 +99,29 @@ public class DataHandlerController {
dataHandlerServer.decorationDataInit(); dataHandlerServer.decorationDataInit();
return ResponseResult.success(true); return ResponseResult.success(true);
} }
@PostMapping("/dataHandlerV20241012")
@ApiOperation("导入OA旧数据")
public ResponseResult<Boolean> dataHandlerV20241012(MultipartFile file) {
ExcelReader reader = null;
try {
reader = ExcelUtil.getReader(file.getInputStream());
} catch (IOException e) {
log.error("read file error:", e);
}
assert reader != null;
log.info("----------------------:{}", file.getOriginalFilename());
List<Map<String, Object>> dataMapList = reader.read(0, 1, Integer.MAX_VALUE);
ImportTaskDO importTaskDO = new ImportTaskDO();
importTaskDO.setFileName(file.getOriginalFilename());
importTaskDO.setFileType(FileTypeEnum.IMPORT_OA_OLD_SHOP_DATA.getFileType());
importTaskDO.setIsImport(true);
importTaskDO.setStatus(ImportTaskStatusEnum.PROGRESS.getCode());
importTaskDO.setCreateUserId(CurrentUserHolder.getUserId());
importTaskDO.setCreateName(CurrentUserHolder.getUser().getName());
importTaskDO.setCreateTime(System.currentTimeMillis());
importTaskMapper.insert(eid, importTaskDO);
dataHandlerServer.dataHandlerV20241012(dataMapList, file.getOriginalFilename(), CurrentUserHolder.getUser(), importTaskDO);
return ResponseResult.success(true);
}
} }