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
2024-05-13 09:52:08 +08:00
parent d1fcdf8ec0
commit 8b478e18ab
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

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