Commit 59137b7851e5a0dddc9d7055b414741421195192
1 parent
e159851012
Exists in
master
and in
8 other branches
code update
Showing 2 changed files with 10 additions and 12 deletions
platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
View file @
59137b7
| ... | ... | @@ -2096,17 +2096,18 @@ |
| 2096 | 2096 | private MessageRequest getMessageRequest(String messageContent,String phone,Integer serviceObj,Integer smsType,String hospitalId,String tempId,String pid) |
| 2097 | 2097 | { |
| 2098 | 2098 | MessageRequest request = new MessageRequest(); |
| 2099 | - //平台ID TODO | |
| 2100 | - request.setTypeId(1); | |
| 2099 | + //平台ID | |
| 2100 | + request.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 2101 | 2101 | request.setContent(messageContent); |
| 2102 | 2102 | //服务对象 1孕妇 2儿童 3产妇 |
| 2103 | 2103 | request.setObjType(serviceObj); |
| 2104 | 2104 | request.setPhone(phone); |
| 2105 | 2105 | //计划发送时间 |
| 2106 | 2106 | request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 2107 | - //短信商 TODO | |
| 2108 | - request.setServiceType(1); | |
| 2107 | + //短信商 | |
| 2108 | + request.setServiceType(SmsProviderEnums.ALDY.getId()); | |
| 2109 | 2109 | request.setSubTypeId(smsType); |
| 2110 | + request.setStatus(SmsStatusEnums.WFS.getId()); | |
| 2110 | 2111 | |
| 2111 | 2112 | //医院ID ext1 |
| 2112 | 2113 | //模板ID ext2; |
| 2113 | 2114 | |
| 2114 | 2115 | |
| ... | ... | @@ -2126,18 +2127,15 @@ |
| 2126 | 2127 | private void sendSms(MessageListRequest list) |
| 2127 | 2128 | { |
| 2128 | 2129 | if (list != null && CollectionUtils.isNotEmpty(list.getMessages())) |
| 2129 | - { //平台ID TODO | |
| 2130 | - list.setTypeId(1); | |
| 2130 | + { //平台ID | |
| 2131 | + list.setTypeId(ProjectTypeEnums.YNXT.getId()); | |
| 2131 | 2132 | if (list != null && list.getMessages() != null) |
| 2132 | 2133 | { |
| 2133 | 2134 | List<MessageRequest> msgs = list.getMessages(); |
| 2134 | 2135 | allMsgs.addAll(msgs); |
| 2135 | -// for (MessageRequest msg :msgs) | |
| 2136 | -// { | |
| 2137 | -// System.out.println("=======" + msg.getContent()); | |
| 2138 | -// } | |
| 2136 | + | |
| 2139 | 2137 | } |
| 2140 | - //SaveMessageService.saveSmsCenter(list); | |
| 2138 | + SaveMessageService.saveSmsCenter(list); | |
| 2141 | 2139 | } |
| 2142 | 2140 | } |
| 2143 | 2141 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
59137b7
| ... | ... | @@ -540,7 +540,7 @@ |
| 540 | 540 | mr.setTypeId(ProjectTypeEnums.YNXT.getId()); |
| 541 | 541 | mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date())); |
| 542 | 542 | mr.setSubTypeId(SmsServiceEnums.FWKT.getId()); |
| 543 | - mr.setStatus(0); | |
| 543 | + mr.setStatus(SmsStatusEnums.WFS.getId()); | |
| 544 | 544 | |
| 545 | 545 | mr.setExt1(babyModel.getHospitalId()); |
| 546 | 546 | mr.setExt2(templateModel.getId()); |