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 1f2b8fba3..e11ba4f64 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 @@ -171,7 +171,7 @@ public class XxlJobHandler { } } } catch (Exception e) { - log.error("定时任务更新订货金失败 shopIds:{}", shopIds); + log.error("定时任务更新订货金失败 shopIds:{},e:{}", shopIds, e.getMessage()); } hasNext = shopIdListByStageStatus.size() >= pageSize; pageNum++; @@ -208,7 +208,7 @@ public class XxlJobHandler { decorationService.getConstruction(shopId); break; } catch (Exception e) { - log.error("定时任务设置进场时间失败,shopId:{}", acceptanceInfoDO.getShopId()); + log.error("定时任务设置进场时间失败,shopId:{},e:{}", acceptanceInfoDO.getShopId(), e.getMessage()); flag++; } } @@ -301,7 +301,7 @@ public class XxlJobHandler { } break; } catch (Exception e) { - log.error("------定时任务三方验收待预约钉钉通知失败,shopId:{}", acceptanceInfoDO.getShopId()); + log.error("------定时任务三方验收待预约钉钉通知失败,shopId:{},e:{}", acceptanceInfoDO.getShopId(), e.getMessage()); flag++; } } @@ -350,41 +350,43 @@ public class XxlJobHandler { } EnterpriseUserDO supervisor = userAuthMappingService .getUserByRoleEnumAndRegionId(UserRoleEnum.ENGINEER_DEP_SUPERVISOR, shopInfo.getRegionId()); - if (Objects.nonNull(supervisor)) { - //获取计划撤场时间 - Date planExitTime = acceptanceInfoDO.getPlanExitTime(); - //获取施工阶段计划完成时间 - Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime(); - //获取计划验收时间 - String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC); - if (StringUtils.isBlank(planAcceptanceTime)) { - planAcceptanceTime = ""; - } - //区域监理手机号 - Boolean f = Boolean.TRUE; - String mobile = supervisor.getMobile(); - String supervisionName = supervisor.getName(); - - Map messageMap = new HashMap<>(); - if (Objects.nonNull(planExitTime)) { - String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, planExitTime); - messageMap.put("demolitionPlanTime", date); - } else { - if (Objects.nonNull(decorationEndTime)) { - String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, decorationEndTime); - messageMap.put("demolitionPlanTime", date); - } - } - messageMap.put("palnAcceptanceTime", planAcceptanceTime); - messageMap.put("supervisionName", supervisionName); - messageMap.put("supervisionMobile", mobile); - commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.THREE_ACCEPTANCE_WAIT, messageMap); + if (Objects.isNull(supervisor)) { + log.error("该区域没有工程部监理,RegionId:{}", shopInfo.getRegionId()); + break; } + //获取计划撤场时间 + Date planExitTime = acceptanceInfoDO.getPlanExitTime(); + //获取施工阶段计划完成时间 + Date decorationEndTime = acceptanceInfoDO.getDecorationPlannedCompletionTime(); + //获取计划验收时间 + String planAcceptanceTime = CoolDateUtils.DateFormat(acceptanceInfoDO.getPlanAcceptanceTime(), CoolDateUtils.DATE_FORMAT_SEC); + if (StringUtils.isBlank(planAcceptanceTime)) { + planAcceptanceTime = ""; + } + //区域监理手机号 + Boolean f = Boolean.TRUE; + String mobile = supervisor.getMobile(); + String supervisionName = supervisor.getName(); + + Map messageMap = new HashMap<>(); + if (Objects.nonNull(planExitTime)) { + String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, planExitTime); + messageMap.put("demolitionPlanTime", date); + } else { + if (Objects.nonNull(decorationEndTime)) { + String date = DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD, decorationEndTime); + messageMap.put("demolitionPlanTime", date); + } + } + messageMap.put("palnAcceptanceTime", planAcceptanceTime); + messageMap.put("supervisionName", supervisionName); + messageMap.put("supervisionMobile", mobile); + commonService.sendSms(lineInfo.getMobile(), SMSMsgEnum.THREE_ACCEPTANCE_WAIT, messageMap); } } break; } catch (Exception e) { - log.error("定时任务三方验收待验收的短信通知失败 shopId:{}", acceptanceInfoDO.getShopId()); + log.error("定时任务三方验收待验收的短信通知失败 shopId:{},e:{}", acceptanceInfoDO.getShopId(), e.getMessage()); flag++; } }