diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java index 603a07d..1b8009d 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java @@ -116,7 +116,9 @@ public class BabyDiseaseMsgGenerateWorker implements Runnable { //开通一个月 一个月按照33天给服务 else if("1".equals(baby.getOpenDiseaseType())) { - openDisDays = DateUtils.getBetweenMonths(DateUtil.addDay(baby.getOpenDiseaseEndTime(),-33),new Date()); + Date date = DateUtil.addDay(baby.getOpenDiseaseEndTime(),-33); + System.out.println(DateUtil.getyyyy_MM_dd(date)); + openDisDays = DateUtils.daysBetween(date, new Date()); } List diseases = baby.getDiseases(); @@ -134,10 +136,10 @@ public class BabyDiseaseMsgGenerateWorker implements Runnable { { for (MessageContent message : amsSmses) { - boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId()); - if (isExist) { - continue; - } +// boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId()); +// if (isExist) { +// continue; +// } //开通一个月 按照ams短信配置的天数来发送 if ("1".equals(baby.getOpenDiseaseType())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index b1761ae..b20124c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1480,7 +1480,12 @@ public class BabyBookbuildingFacade { bm.setOpenDisease(b.getOpenDisease()); bm.setOpenDiseaseType(b.getOpenDiseaseType()); - bm.setOpenDiseaseEndTime(b.getOpenDiseaseType() ==null ? null : DateUtil.addMonth(bm.getBuildDate(),Integer.parseInt(b.getOpenDiseaseType()))); + Date endTime = null; + if (b.getOpenDiseaseType() ==null) + { + endTime = "1".equals(bm.getBuildDate()) ? DateUtil.addDay(bm.getBuildDate(),33) : DateUtil.addMonth(bm.getBuildDate(),Integer.parseInt(b.getOpenDiseaseType())); + } + bm.setOpenDiseaseEndTime(endTime); return bm; }