diff --git a/src/main/java/com/ifish/action/VipAction.java b/src/main/java/com/ifish/action/VipAction.java index f73f9e7..5631551 100644 --- a/src/main/java/com/ifish/action/VipAction.java +++ b/src/main/java/com/ifish/action/VipAction.java @@ -48,7 +48,7 @@ public class VipAction { @RequestMapping("/sendSms.do") @ResponseBody public Object vipSendSms(HttpServletRequest request) throws ClientException { - final String noticeType = "SMS_139227937"; + final String noticeType = "SMS_153716473"; final String noticeTypeCertif = "SMS_143712160"; final String noticeTypeMember = "SMS_143717029"; final String noticeTypeStudent = "SMS_142146106"; @@ -60,6 +60,8 @@ public class VipAction { String smsTitle = request.getParameter("smsTitle"); String smsTime = request.getParameter("smsTime"); String smsAddress = request.getParameter("smsAddress"); + String smsAddress1 = request.getParameter("smsAddress1"); + String smsAddress2 = request.getParameter("smsAddress2"); String smsSignTime = request.getParameter("smsSignTime"); String smsContact = request.getParameter("smsContact"); String smsContactTel = request.getParameter("smsContactTel"); @@ -97,6 +99,8 @@ public class VipAction { param.put("title",smsTitle); param.put("time",smsTime); param.put("address",smsAddress); + param.put("address1",smsAddress1); + param.put("address2",smsAddress2); param.put("signTime",smsSignTime); param.put("contact",smsContact + " " + smsContactTel); response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); @@ -152,6 +156,8 @@ public class VipAction { param.put("title",smsTitle); param.put("time",smsTime); param.put("address",smsAddress); + param.put("address1",smsAddress1); + param.put("address2",smsAddress2); param.put("signTime",smsSignTime); param.put("contact",smsContact + " " + smsContactTel); response = SmsUtil.sendSms(vipMember.getMemberTel(), smsType, param.toJSONString()); @@ -535,7 +541,7 @@ public class VipAction { public ModelAndView downloadActivityImportToExcel(@RequestParam("fileUpload") MultipartFile fileUpload,HttpServletRequest request){ SecurityContextImpl securityContextImpl = (SecurityContextImpl) request.getSession().getAttribute("SPRING_SECURITY_CONTEXT"); - final String noticeType = "SMS_139227937"; + final String noticeType = "SMS_153716473"; final String noticeTypeCertif = "SMS_143712160"; final String noticeTypeMember = "SMS_143717029"; final String noticeTypeStudent = "SMS_142146106"; @@ -545,6 +551,8 @@ public class VipAction { String smsTitle = request.getParameter("smsTitle"); String smsTime = request.getParameter("smsTime"); String smsAddress = request.getParameter("smsAddress"); + String smsAddress1 = request.getParameter("smsAddress1"); + String smsAddress2 = request.getParameter("smsAddress2"); String smsSignTime = request.getParameter("smsSignTime"); String smsContact = request.getParameter("smsContact"); String smsContactTel = request.getParameter("smsContactTel"); @@ -563,6 +571,8 @@ public class VipAction { param.put("title",smsTitle); param.put("time",smsTime); param.put("address",smsAddress); + param.put("address1",smsAddress1); + param.put("address2",smsAddress2); param.put("signTime",smsSignTime); param.put("contact",smsContact + " " + smsContactTel); } else if (noticeTypeStudent.equals(smsType)) { diff --git a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp index 7b4793b..7559785 100644 --- a/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp +++ b/src/main/webapp/WEB-INF/view/vip/vipActivity.jsp @@ -240,46 +240,48 @@