Commit ae690f85907d1c41d3456f73b3597aa5f171f87f
1 parent
506a901b03
Exists in
master
and in
8 other branches
code update
Showing 3 changed files with 12 additions and 7 deletions
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
View file @
ae690f8
| ... | ... | @@ -742,8 +742,12 @@ |
| 742 | 742 | // System.out.println(s); |
| 743 | 743 | // Date s = addDay(parseYMD("2016-02-26"), 168); |
| 744 | 744 | |
| 745 | - Date startDate = DateUtil.getNewDate(-0,"周",0); | |
| 746 | - Date endDate = DateUtil.getNewDate(-1-1,"周",0); | |
| 745 | + int start = 0; | |
| 746 | + int end = 1; | |
| 747 | + | |
| 748 | + | |
| 749 | + Date startDate = DateUtil.getNewDate(-end-1,"周",0); | |
| 750 | + Date endDate = DateUtil.getNewDate(-start,"周",0); | |
| 747 | 751 | |
| 748 | 752 | System.out.println(startDate + "==="+ endDate); |
| 749 | 753 | } catch (Exception e) |
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
ae690f8
| ... | ... | @@ -1116,8 +1116,8 @@ |
| 1116 | 1116 | |
| 1117 | 1117 | if (start != null && end != null) |
| 1118 | 1118 | { |
| 1119 | - Date startDate = DateUtil.getNewDate(-end, "月", sendTimeType); | |
| 1120 | - Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType); | |
| 1119 | + Date startDate = DateUtil.getNewDate(-end-1, "月", sendTimeType); | |
| 1120 | + Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType); | |
| 1121 | 1121 | babyModelQuery.setBirthStart(startDate); |
| 1122 | 1122 | babyModelQuery.setBirthEnd(endDate); |
| 1123 | 1123 | |
| ... | ... | @@ -1250,8 +1250,8 @@ |
| 1250 | 1250 | Integer end = template.getEnd(); |
| 1251 | 1251 | if (start != null && end != null) |
| 1252 | 1252 | { |
| 1253 | - Date startDate = DateUtil.getNewDate(-end,"月",sendTimeType); | |
| 1254 | - Date endDate = DateUtil.getNewDate(-start-1,"月",sendTimeType); | |
| 1253 | + Date startDate = DateUtil.getNewDate(-end-1,"月",sendTimeType); | |
| 1254 | + Date endDate = DateUtil.getNewDate(-start,"月",sendTimeType); | |
| 1255 | 1255 | babyModelQuery.setBirthStart(startDate); |
| 1256 | 1256 | babyModelQuery.setBirthEnd(endDate); |
| 1257 | 1257 | messages.addAll(getBabyMessageRequestList( babyModelQuery, config, template)); |
platform-data-api/src/main/java/com/lyms/platform/data/util/AmsMessageService.java
View file @
ae690f8
| ... | ... | @@ -27,6 +27,7 @@ |
| 27 | 27 | public class AmsMessageService { |
| 28 | 28 | private static final Logger logger = Logger.getLogger(AmsMessageService.class); |
| 29 | 29 | private static final String AMS_URL = "http://data.api.healthbaby.com.cn/v1/messages"; |
| 30 | +//private static final String AMS_URL = "http://data.api.stage.healthbaby.com.cn/v1/messages"; | |
| 30 | 31 | private static final String AUTHORIZATION = "healthbaby2015"; |
| 31 | 32 | |
| 32 | 33 | |
| ... | ... | @@ -181,7 +182,7 @@ |
| 181 | 182 | |
| 182 | 183 | |
| 183 | 184 | public static void main(String[] args) { |
| 184 | - getMessageTemplateMap("241", | |
| 185 | + getMessageTemplateMap("245", | |
| 185 | 186 | AmsServiceTypeEnum.CHILD_GUIDE); |
| 186 | 187 | } |
| 187 | 188 |