jiangjiazhi / regional-platform

Authored by tranny over 4 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 13 additions and 6 deletions

...	...	@@ -116,7 +116,9 @@
116	116	//开通一个月一个月按照33天给服务
117	117	else if("1".equals(baby.getOpenDiseaseType()))
118	118	{
119		- openDisDays = DateUtils.getBetweenMonths(DateUtil.addDay(baby.getOpenDiseaseEndTime(),-33),new Date());
	119	+ Date date = DateUtil.addDay(baby.getOpenDiseaseEndTime(),-33);
	120	+ System.out.println(DateUtil.getyyyy_MM_dd(date));
	121	+ openDisDays = DateUtils.daysBetween(date, new Date());
120	122	}
121	123
122	124	List<String> diseases = baby.getDiseases();
...	...	@@ -134,10 +136,10 @@
134	136	{
135	137	for (MessageContent message : amsSmses)
136	138	{
137		- boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId());
138		- if (isExist) {
139		- continue;
140		- }
	139	+// boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId());
	140	+// if (isExist) {
	141	+// continue;
	142	+// }
141	143	//开通一个月按照ams短信配置的天数来发送
142	144	if ("1".equals(baby.getOpenDiseaseType()))
143	145	{

...	...	@@ -1480,7 +1480,12 @@
1480	1480
1481	1481	bm.setOpenDisease(b.getOpenDisease());
1482	1482	bm.setOpenDiseaseType(b.getOpenDiseaseType());
1483		- bm.setOpenDiseaseEndTime(b.getOpenDiseaseType() ==null ? null : DateUtil.addMonth(bm.getBuildDate(),Integer.parseInt(b.getOpenDiseaseType())));
	1483	+ Date endTime = null;
	1484	+ if (b.getOpenDiseaseType() ==null)
	1485	+ {
	1486	+ endTime = "1".equals(bm.getBuildDate()) ? DateUtil.addDay(bm.getBuildDate(),33) : DateUtil.addMonth(bm.getBuildDate(),Integer.parseInt(b.getOpenDiseaseType()));
	1487	+ }
	1488	+ bm.setOpenDiseaseEndTime(endTime);
1484	1489
1485	1490	return bm;
1486	1491	}