jiangjiazhi / regional-platform

Authored by liquanyu over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 28 additions and 2 deletions

...	...	@@ -301,6 +301,21 @@
301	301	return rightNow.getTime();
302	302	}
303	303
	304	+ public static Date addMonth(Date srcDate, int month) {
	305	+ Calendar rightNow = Calendar.getInstance();
	306	+ rightNow.setTime(srcDate);
	307	+ rightNow.add(Calendar.DAY_OF_MONTH, month);
	308	+ return rightNow.getTime();
	309	+ }
	310	+
	311	+ public static Date addYear(Date srcDate, int year) {
	312	+ Calendar rightNow = Calendar.getInstance();
	313	+ rightNow.setTime(srcDate);
	314	+ rightNow.add(Calendar.DAY_OF_YEAR, year);
	315	+ return rightNow.getTime();
	316	+ }
	317	+
	318	+
304	319	/**
305	320	* 获取当天还剩多少秒
306	321	*

...	...	@@ -229,7 +229,18 @@
229	229	bm.setExpVip(b.getExpVip());
230	230	bm.setMremark(b.getMremark());
231	231	bm.setDiagnose(b.getDiagnose());
232		- bm.setVipEndTime(DateUtil.parseYMD(b.getVipEndTime()));
	232	+
	233	+ if (b.getExpType() == ExpEnums.SGY.getId())
	234	+ {
	235	+ Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3);
	236	+ bm.setVipEndTime(vipEndTime);
	237	+ }
	238	+ else
	239	+ {
	240	+ Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3);
	241	+ bm.setVipEndTime(vipEndTime);
	242	+ }
	243	+
233	244	bm.setServiceStatus(b.getServiceStatus());
234	245
235	246	bm.setDueDate(DateUtil.parseYMD(b.getDueDate()));
...	...	@@ -338,7 +349,7 @@
338	349	result.setExpVip(model.getExpVip());
339	350	result.setMremark(model.getMremark() == null ? "" : model.getMremark());
340	351	result.setDiagnose(model.getDiagnose());
341		- result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
	352	+ //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
342	353	result.setServiceStatus(String.valueOf(model.getServiceStatus()));
343	354
344	355