From 15a612050bded53fa534a2a6c7d7da7dc1a3f495 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 30 Jun 2016 16:56:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=93=E9=AA=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/DateUtil.java | 15 +++++++++++++++ .../operate/web/facade/BabyBookbuildingFacade.java | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 35726b0..34a9aac 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -301,6 +301,21 @@ public class DateUtil { return rightNow.getTime(); } + public static Date addMonth(Date srcDate, int month) { + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(srcDate); + rightNow.add(Calendar.DAY_OF_MONTH, month); + return rightNow.getTime(); + } + + public static Date addYear(Date srcDate, int year) { + Calendar rightNow = Calendar.getInstance(); + rightNow.setTime(srcDate); + rightNow.add(Calendar.DAY_OF_YEAR, year); + return rightNow.getTime(); + } + + /** * 获取当天还剩多少秒 * 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 35efa77..053f9f7 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 @@ -229,7 +229,18 @@ public class BabyBookbuildingFacade { bm.setExpVip(b.getExpVip()); bm.setMremark(b.getMremark()); bm.setDiagnose(b.getDiagnose()); - bm.setVipEndTime(DateUtil.parseYMD(b.getVipEndTime())); + + if (b.getExpType() == ExpEnums.SGY.getId()) + { + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3); + bm.setVipEndTime(vipEndTime); + } + else + { + Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3); + bm.setVipEndTime(vipEndTime); + } + bm.setServiceStatus(b.getServiceStatus()); bm.setDueDate(DateUtil.parseYMD(b.getDueDate())); @@ -338,7 +349,7 @@ public class BabyBookbuildingFacade { result.setExpVip(model.getExpVip()); result.setMremark(model.getMremark() == null ? "" : model.getMremark()); result.setDiagnose(model.getDiagnose()); - result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); + //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime())); result.setServiceStatus(String.valueOf(model.getServiceStatus())); -- 1.8.3.1