Merge remote-tracking branch 'origin/master'

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

@@ -1,24 +1,37 @@
 package com.ym.mec.collectfee.controller;
 
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.collectfee.common.web.BaseController;
-import com.ym.mec.collectfee.entity.*;
+import com.ym.mec.collectfee.entity.ApplyInfo;
+import com.ym.mec.collectfee.entity.Branch;
+import com.ym.mec.collectfee.entity.CourseGroupInfo;
+import com.ym.mec.collectfee.entity.MecUser;
+import com.ym.mec.collectfee.entity.MecUserInfo;
+import com.ym.mec.collectfee.entity.MusicTeamsPageInfo;
+import com.ym.mec.collectfee.entity.School;
+import com.ym.mec.collectfee.entity.StudentsQueryInfo;
 import com.ym.mec.collectfee.service.ApplyInfoService;
 import com.ym.mec.collectfee.service.CourseGroupInfoService;
 import com.ym.mec.collectfee.service.OrderService;
 import com.ym.mec.collectfee.service.SchoolService;
 import com.ym.mec.collectfee.utils.Constants;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DuplicateKeyException;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpSession;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @RestController()
 @RequestMapping("user")
@@ -81,10 +94,16 @@ public class UserController extends BaseController {
      * @return
      */
     @GetMapping("/getMecUser")
-    public Object getMecUser(String phone) {
+    public Object getMecUser(String phone,String smsCode,HttpSession session) {
         if (StringUtils.isEmpty(phone)) {
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
+        if (StringUtils.isEmpty(smsCode)) {
+            return failed(Constants.PARAM_VERIFY_ERROR_MSG);
+        }
+        if (!applyInfoService.verifySmsCode(phone, smsCode, session)) {
+            return failed("验证码失败！");
+        }
         
         MecUserInfo mecUser = applyInfoService.mecUserIsExist(phone);
         MecUser user = null;

src/main/resources/application.yml

@@ -13,12 +13,12 @@ spring:
 
   datasource:
     name: test
-  #  url: jdbc:mysql://47.96.80.97:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
-  #  username: root
-  #  password: dayayuemeng2019
-    url: jdbc:mysql://localhost:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://47.96.80.97:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
     username: root
     password: dayayuemeng2019
+  #  url: jdbc:mysql://localhost:3306/daya_pay?useUnicode=true&characterEncoding=UTF8&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai
+  #  username: root
+  #  password: root
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver

src/main/resources/config/mybatis/ApplyInfoMapper.xml

@@ -183,7 +183,7 @@
 	<select id="getUserRegisterVIewDetail" resultType="java.util.Map">
 		SELECT ai.sub_id_,ai.is_adjust_,ai.status_,ai.sex_,ai.name_,ai.patriarch_phone_,ai.sub_id_,
 		ai.grade_,ai.school_,ai.id_,ai.g_class_,ai.city_,ai.patriarch_name_,ai.patriarch_unit_,ai.course_id_,ai.remark,
-		cgi.sub_name_,cgi.plan_num_,cgi.fee_amount_,cgi.fee_type_,s.is_single_,s.status_ push_status_
+		cgi.sub_name_,cgi.plan_num_,cgi.fee_amount_,cgi.fee_type_,s.is_single_,s.status_, push_status_,s.amount_type_
 		FROM apply_info ai LEFT JOIN course_group_info cgi ON ai.course_id_ = cgi.id_
 		 LEFT JOIN school s ON ai.class_id_ = s.id_ WHERE ai.id_ = #{stuId}
 	</select>