提交优惠登记验证码校验、身份认证

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -68,7 +68,7 @@ public class LoginPwdController extends BaseController {
 
 
     private static String ERRCODENAME = "ForgeERRCODENAME";
     private static String ERRCODENAME = "ForgeERRCODENAME";
 
 
-    private static long CODETIME = 1000 * 60 * 30;
+    private static long CODETIME = 1000 * 60 * 5;
 
 
     private static int ERRACCOUNT = 10;
     private static int ERRACCOUNT = 10;
 
 

old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -10,6 +10,7 @@ import com.winsun.bean.*;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.UserType;
 import com.winsun.constant.UserType;
 import com.winsun.mapper.*;
 import com.winsun.mapper.*;
+import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.IDCardUtil;
 import com.winsun.utils.IDCardUtil;
 import com.winsun.utils.ProduceIdUtil;
 import com.winsun.utils.ProduceIdUtil;
 import com.winsun.utils.RandomUtil;
 import com.winsun.utils.RandomUtil;
@@ -123,13 +124,13 @@ public class PackageUpgradeController extends BaseController {
             }else {
             }else {
                 //不是存量  跳转到三大权益
                 //不是存量  跳转到三大权益
                 objMap.put("isStock", false);
                 objMap.put("isStock", false);
-                return ResponseData.success(objMap,"当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
+                return ResponseData.error(objMap,"当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
             }
             }
             String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
             String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
             log.info("验证码:" + s);
             log.info("验证码:" + s);
-            //MessageUtil.sent(packageUpgrade.getAccNbr(),"4","您获取的验证码为："+s+",半小时内有效。");
+            SendSmsAndMail.sendSms(selectOrder,s,"7");
             redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
             redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
-            return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11) + "验证码：" + s);
+            return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
 
 
         }
         }
     }
     }
@@ -150,11 +151,11 @@ public class PackageUpgradeController extends BaseController {
                 , "is_bltc2", "is_bltc3", "speed_kd", "wxcl");
                 , "is_bltc2", "is_bltc3", "speed_kd", "wxcl");
         if (StringUtils.isNotBlank(servId)) {
         if (StringUtils.isNotBlank(servId)) {
             wrapper.eq(StringUtils.isNotBlank(servId), "serv_id", servId);
             wrapper.eq(StringUtils.isNotBlank(servId), "serv_id", servId);
-            try {
-                ver = redisTemplate.opsForValue().get(servId).toString();
-            } catch (NullPointerException n) {
-                return ResponseData.error("验证码已失效，请重新登入！");
-            }
+//            try {
+//                ver = redisTemplate.opsForValue().get(servId).toString();
+//            } catch (NullPointerException n) {
+//                return ResponseData.error("验证码已失效，请重新登入！");
+//            }
         } else {
         } else {
             if (selectOrder.length() == 11) {
             if (selectOrder.length() == 11) {
                 wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
                 wrapper.eq(StringUtils.isNotBlank(selectOrder), "acc_nbr", selectOrder);
@@ -349,6 +350,9 @@ public class PackageUpgradeController extends BaseController {
         order.setHehuorenName(sysUser.getName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
         String schoolId = appMapper.selectSchoolId(partner);
         List<String> dudao = appMapper.selectsupervisorBySchool(schoolId);
         List<String> dudao = appMapper.selectsupervisorBySchool(schoolId);
+        if (dudao == null || dudao.size() == 0) {
+            return ResponseData.error("当前学校未配置督导！");
+        }
         SysUser user = userMapper.selectById(dudao.get(0));
         SysUser user = userMapper.selectById(dudao.get(0));
         order.setSupervisorName(user.getName());
         order.setSupervisorName(user.getName());
         String schoolName = appMapper.selectSchoolById(schoolId);
         String schoolName = appMapper.selectSchoolById(schoolId);