Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

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

@@ -47,10 +47,12 @@ public class UserController extends BaseController {
         if(StringUtils.isEmpty(phone) || clazzId == null || cityId == null){
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
-        if(applyInfoService.mecUserIsExist(phone)){
+        
+        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, null);
+        
+        if(userByPhone == null && applyInfoService.mecUserIsExist(phone)){
             return failed(Constants.PARAM_EXIST_ERROR_MSG);
         }
-        ApplyInfo userByPhone = applyInfoService.findUserByPhone(phone, null);
         if(userByPhone != null && !userByPhone.getClassId().equals(clazzId)){//如果改用户存在其他团中
         	return failed(Constants.PARAM_EXIST_ERROR_MSG);
         }

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

@@ -51,6 +51,8 @@ public class YqPayController extends BaseController {
 
     @Autowired
     private RenewalsService renewalsService;
+    @Autowired
+    private SchoolService schoolService;
 
 
     /**
@@ -118,8 +120,9 @@ public class YqPayController extends BaseController {
         order.setSdFee(adjunctPrice);
 
 
+        School school = schoolService.get(order.getClassId());
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //异步通知地址
-        String returnUrl = "http://dev.dayaedu.com";//支付后返回页面
+        String returnUrl = "http://pay.dayaedu.com/login?schoolId=" + school.getId() + "&classId=" + order.getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
         String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置
 
@@ -151,6 +154,7 @@ public class YqPayController extends BaseController {
         List<Map> tempRoutingList = new ArrayList();
         tempRoutingList.add(routingList);
 
+        order.setUAccount(account.getId().toString());
         order.setAccount(routingMerNo);
 
         //1、插入订单
@@ -218,7 +222,7 @@ public class YqPayController extends BaseController {
         Integer buyCount = mecCourse4json.getBuyCount();
         BigDecimal amount = new BigDecimal("0"); //课程总价
         String remark = "";
-        List<MecCourse> pickCourses = null;
+        List<MecCourse> pickCourses = new ArrayList<>();
         for (int i = 0; i < courses.size(); i++) {
             MecCourse course = courses.get(i);
             if (mecCourse4json.getCourseId().equals(course.getCourseId().intValue())) {
@@ -235,8 +239,12 @@ public class YqPayController extends BaseController {
             return failed("请选择续费课程");
         }
 
+        School school = schoolService.get(pickCourses.get(0).getClassId());
+        if (school ==null){
+            return failed("报名学校不存在");
+        }
         String notifyUrl = "http://47.99.212.176:9000/yqpay/notify"; //异步通知地址
-        String returnUrl = "http://dev.dayaedu.com";//支付后返回页面
+        String returnUrl = "http://pay.dayaedu.com/login?schoolId=" + school.getId() + "&classId=" + pickCourses.get(0).getClassId() + "&cityId=" + school.getCityId();//支付后返回页面
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
         String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置
 
@@ -265,7 +273,7 @@ public class YqPayController extends BaseController {
         List<Map> tempRoutingList = new ArrayList();
         tempRoutingList.add(routingList);
 
-        renewalsService.addRenewalsOrder(renewals, amount, orderNo, pickCourses, routingMerNo, remark);
+        renewalsService.addRenewalsOrder(renewals, amount, orderNo, pickCourses, routingMerNo,account.getId(), remark);
 
         /*订单信息*/
         String orderBody = "大雅乐盟培训课程";

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

@@ -17,7 +17,7 @@ public interface RenewalsService extends BaseService<Integer, Renewals> {
      * @param mecCourses
      * @return
      */
-    Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, String remark);
+    Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, int accountId,String remark);
 
     void renewalsInsert(ArrayList<Renewals> renewalsArrayList);
 

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

@@ -45,7 +45,7 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo, String remark) {
+    public Order addRenewalsOrder(Renewals renewals, BigDecimal amount, String orderNo, List<MecCourse> mecCourses, String routingMerNo,int accountId, String remark) {
 
         Order order = new Order();
         order.setBranchId(renewals.getBranchId());
@@ -56,6 +56,7 @@ public class RenewalsServiceImpl extends BaseServiceImpl<Integer, Renewals> impl
         order.setRemark(remark);
         order.setClassId(renewals.getClassId());
         order.setStatus(1);
+        order.setUAccount(String.valueOf(accountId));
         order.setCreateTime(new Date());
 
         //1、插入订单

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

@@ -35,6 +35,9 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 	private String secretKey;
 	@Value("${common.properties.sms-host-dev}")
 	private String host;
+	@Value("${common.properties.sms-send-request-url}")
+	private String sendUrl;
+	
 	// 加密算法
 	private String algorithm = "AES/ECB/PKCS5Padding";
 	// 编码
@@ -77,12 +80,13 @@ public class SchoolServiceImpl extends BaseServiceImpl<Integer, School> implemen
 			school.setUpdateTime(new Date());
 			school.setStatus(2);
 			schoolDao.update(school);
+			String url = sendUrl + "schoolId=" + school.getId() + "&classId=" + school.getId() + "&cityId=" + school.getCityId();
 			//发送短信
 			//获取所有用户手机号列表
 			List<String> userPhone = applyInfoDao.findUserByClass(classId,null);
 			String[] objects=userPhone.toArray(new String[userPhone.size()]);
 			SmsExample.setBatchOnlySms(appId,secretKey,host,algorithm,
-					String.format(Constants.SMS_TEMPLATE, DateUtils.getDayForAfter(new Date(), 2), ShortUrlUtil.sinaShortUrl("http://pay.dayaedu.com/?schoolId=2&classId=10381&cityId=1302")),
+					String.format(Constants.SMS_TEMPLATE, DateUtils.getDayForAfter(new Date(), 2), ShortUrlUtil.sinaShortUrl(url)),
 					null,objects,isGizp,encode);
 		}
 	}

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

@@ -4,5 +4,5 @@ public interface Constants {
     String PARAM_VERIFY_ERROR_MSG = "参数校验异常";
     String PARAM_EXIST_ERROR_MSG = "该用户已在其他乐团报名";
     
-    String SMS_TEMPLATE = "家长您好：恭喜您的孩子被管乐团录取！请您收到录取通知书后，于%s晚24：00前点此链接%s或扫录取通知书上的二维码为学生完成入团注册缴费手续，专业以录取专业为准。完成后请关注深圳大雅乐盟（D-Y-M-E）点击菜单栏乐人进入乐团助手页面，查看课程安排。";
+    String SMS_TEMPLATE = "家长您好：恭喜您的孩子被管乐团录取！请您收到录取通知书后，于%s晚24：00前点此链接%s 或扫录取通知书上的二维码为学生完成入团注册缴费手续，专业以录取专业为准。完成后请关注深圳大雅乐盟（D-Y-M-E）点击菜单栏乐人进入乐团助手页面，查看课程安排。";
 }

src/main/resources/application.yml

@@ -70,4 +70,5 @@ common:
     sms-appId: EUCP-EMY-SMS1-1AIHP
     sms-secretKey: CBA790799C876DAD
     sms-host-dev: http://bjksmtn.b2m.cn
+    sms-send-request-url: https://pay.dayaedu.com/#/?