diff --git a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java index 3de428dc2..81d29e0e8 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java @@ -250,8 +250,9 @@ public class XxlJobHandler { } List shopIds = shopIdListByStageStatus.stream().filter(o -> o.getShopId() != null).map(o -> o.getShopId()).collect(Collectors.toList()); List acceptanceInfoDOS = acceptanceInfoDAO.selectByShopIds(shopIds); - int flag = CommonConstants.ZERO; + for (AcceptanceInfoDO acceptanceInfoDO : acceptanceInfoDOS) { + int flag = CommonConstants.ZERO; //进场时间 while (flag < CommonConstants.TWO) { try { @@ -281,7 +282,6 @@ public class XxlJobHandler { flag++; } } - flag = CommonConstants.ZERO; } hasNext = shopIdListByStageStatus.size() >= pageSize; pageNum++; @@ -396,8 +396,6 @@ public class XxlJobHandler { } List shopIds = ShopStageInfoList.stream().filter(o -> o.getShopId() != null) .map(ShopStageInfoDO::getShopId).collect(Collectors.toList()); - Map lineIdMap = ShopStageInfoList.stream().filter(o -> o.getLineId() != null) - .collect(Collectors.toMap(ShopStageInfoDO::getLineId, Function.identity())); List acceptanceList = acceptanceInfoDAO.selectByShopIds(shopIds); List shopListByIds = shopInfoDAO.getShopListByIds(shopIds); Map shopIdMap = shopListByIds.stream().filter(o -> o.getId() != null) @@ -409,12 +407,11 @@ public class XxlJobHandler { if (Objects.nonNull(approach)) { LocalDate plusFDays = DateUtils.getPlusFDays(approach, CommonConstants.SIX);//7天 if (plusFDays.equals(LocalDate.now())) { - ShopStageInfoDO stageInfoDO = lineIdMap.get(shopId); ShopInfoDO shopInfoDO = shopIdMap.get(shopId); if (StringUtils.isBlank(shopInfoDO.getSupervisorUserId())){ log.error("定时任务三方待验收钉钉通知,督导id为空,shopId:{}", shopId); } - Long lineId = stageInfoDO.getLineId(); + Long lineId = shopInfoDO.getLineId(); LineInfoDO lineInfo = lineInfoDAO.getLineInfo(lineId); Map messageMap = new HashMap<>(); messageMap.put("storeName", shopInfoDO.getShopName());