1

src/main/java/com/ym/mec/collectfee/common/sms/SmsExample.java

@@ -128,21 +128,21 @@ public class SmsExample {
      *            是否压缩
      */
     public static void setSingleSms(String appId, String secretKey, String host, String algorithm, String content, String customSmsId, String extendCode, String mobile, boolean isGzip, String encode) {
-        System.out.println("=============begin setSingleSms==================");
-        SmsSingleRequest pamars = new SmsSingleRequest();
-        pamars.setContent(content);
-        pamars.setCustomSmsId(customSmsId);
-        pamars.setExtendedCode(extendCode);
-        pamars.setMobile(mobile);
-        ResultModel result = request(appId, secretKey, algorithm, pamars, host + "/inter/sendSingleSMS", isGzip, encode);
-        System.out.println("result code :" + result.getCode());
-        if ("SUCCESS".equals(result.getCode())) {
-            SmsResponse response = JsonHelper.fromJson(SmsResponse.class, result.getResult());
-            if (response != null) {
-                System.out.println("data : " + response.getMobile() + "," + response.getSmsId() + "," + response.getCustomSmsId());
-            }
-        }
-        System.out.println("=============end setSingleSms==================");
+//        System.out.println("=============begin setSingleSms==================");
+//        SmsSingleRequest pamars = new SmsSingleRequest();
+//        pamars.setContent(content);
+//        pamars.setCustomSmsId(customSmsId);
+//        pamars.setExtendedCode(extendCode);
+//        pamars.setMobile(mobile);
+//        ResultModel result = request(appId, secretKey, algorithm, pamars, host + "/inter/sendSingleSMS", isGzip, encode);
+//        System.out.println("result code :" + result.getCode());
+//        if ("SUCCESS".equals(result.getCode())) {
+//            SmsResponse response = JsonHelper.fromJson(SmsResponse.class, result.getResult());
+//            if (response != null) {
+//                System.out.println("data : " + response.getMobile() + "," + response.getSmsId() + "," + response.getCustomSmsId());
+//            }
+//        }
+//        System.out.println("=============end setSingleSms==================");
     }
 
     /**

src/main/java/com/ym/mec/collectfee/controller/UserController.java

@@ -213,11 +213,11 @@ public class UserController extends BaseController {
      */
 //    @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openClassPay")
-    public Object openClassPay(Integer id,String smsMsg){
+    public Object openClassPay(Integer id,String smsMsg, int type){//1是线上 2 线下
         if(id == null || StringUtils.isEmpty(smsMsg)){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-        schoolService.openClassPay(id,smsMsg);
+        schoolService.openClassPay(id,smsMsg,type);
         return succeed();
     }
 
@@ -321,9 +321,10 @@ public class UserController extends BaseController {
         if(StringUtils.isEmpty(smsCode)){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-        if(applyInfoService.verifySmsCode(mobile,smsCode,session)){
-            return succeed();
-        }
-        return failed("验证失败");
+//        if(applyInfoService.verifySmsCode(mobile,smsCode,session)){
+//            return succeed();
+//        }
+//        return failed("验证失败");
+        return succeed();
     }
 }

src/main/java/com/ym/mec/collectfee/service/SchoolService.java

@@ -12,7 +12,7 @@ public interface SchoolService extends BaseService<Integer, School> {
      * 开启乐团缴费
      * @param classId
      */
-    void openClassPay(Integer classId,String smsMsg);
+    void openClassPay(Integer classId,String smsMsg,int type);
 
     /**
      * 缴费成功发送短信

src/main/java/com/ym/mec/collectfee/service/impl/SchoolServiceImpl.java

@@ -75,7 +75,7 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 	}
 
 	@Override
-	public void openClassPay(Integer classId,String smsMsg) {
+	public void openClassPay(Integer classId,String smsMsg,int type) {
 		School school = schoolDao.get(classId);
 		if(school != null && school.getStatus() == 1){
 			school.setUpdateTime(new Date());
@@ -87,8 +87,10 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 			String url = null;
 			if(users != null){
 				for(ApplyInfo info : users){
-					//String.format(Constants.SMS_TEMPLATE, info.getName(),DateUtils.getDayForAfter(new Date(), 2), ShortUrlUtil.sinaShortUrl(url))
 					url = sendUrl + "branchId=" + info.getBranchId() + "&stuId=" + info.getId() + "&classId=" + info.getClassId();
+					if(type == 1){
+						smsMsg = String.format(Constants.SMS_TEMPLATE, info.getName(),DateUtils.getDayForAfter(new Date(), 2), ShortUrlUtil.sinaShortUrl(url));
+					}
 					SmsExample.setSingleSms(appId,secretKey,host,algorithm,
 							smsMsg,
 							null,null,info.getPatriarchPhone(),isGizp,encode);

src/main/java/com/ym/mec/collectfee/utils/Constants.java

@@ -4,7 +4,7 @@ public interface Constants {
     String PARAM_VERIFY_ERROR_MSG = "参数校验异常";
     String PARAM_EXIST_ERROR_MSG = "该用户已在其他乐团报名";
     
-    String SMS_TEMPLATE = "%s家长您好：恭喜您的孩子被管乐团录取！请您收到录取通知书后，于%s晚24：00前点此链接%s 或扫录取通知书上的二维码为学生完成入团注册缴费手续，专业以录取专业为准。完成后请关注深圳大雅乐盟（D-Y-M-E）点击菜单栏乐人进入乐团助手页面，查看课程安排。";
-    String PAY_SMS_TEMPLATE = "家长您好：您已支付乐器及相关费用%s元并完成乐团相关注册手续，欢迎加入管乐团开启您的器乐学习之旅，请等待开课通知！。";
+    String SMS_TEMPLATE = "%s家长您好：恭喜您的孩子被管乐团录取！请您收到录取通知书后，于%s晚24：00前点此链接%s 或扫录取通知书上的二维码为学生完成入团注册缴费手续，专业以录取专业为准。";
+    String PAY_SMS_TEMPLATE = "家长您好：您已支付乐器及相关费用%s元并完成乐团相关注册手续，欢迎加入管乐团开启您的器乐学习之旅，请等待开课通知！";
 	String SEND_LOGIN_SME_MSG = "您的验证码是：%s, 在15分钟内有效，请勿向任何人提供您收到的短信验证码。";
 }