Merge remote-tracking branch 'origin/master'

apply-net/src/main/java/com/winsun/controller/codeManagerController.java

@@ -57,6 +57,27 @@ public class codeManagerController {
     @Autowired
     private UniversityInfoMapper universityInfoMapper;
 
+    @Autowired
+    private SysUserMapper sysUserMapper;
+
+    /**
+     * 解锁用户
+     * @param userId
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "unlock", method = RequestMethod.POST)
+    public ResponseData<String> unlock(String userId) {
+
+        SysUser sysUser = sysUserMapper.selectById(userId);
+        if (sysUser != null) {
+            redisTemplate.delete("SYS_LOGIN_ERROR" + sysUser.getAccount());
+            return ResponseData.success("成功");
+        }else{
+            return ResponseData.success("解锁失败");
+        }
+    }
+
     @ResponseBody
     @RequestMapping(value = "sendCodes", method = RequestMethod.POST)
     public ResponseData<Map<String, Object>> checkStudent(String phone) {

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -370,8 +370,10 @@ public class PackageNewClothes {
         order.setHehuorenSchool(school.getSchoolName());
         order.setHehuorenPhone(sysUser.getPhone());
         List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
+        if (userId != null && userId.size() != 0) {
             SysUser user = userMapper.selectById(userId.get(0));
             order.setSupervisorName(user.getName());
+        }
         order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
         // MessageUtil.sent(contactNumber,"4","");
@@ -486,9 +488,9 @@ public class PackageNewClothes {
             return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
         }
         if (!"0".equals(jsonObject.getString("code"))) {
-            return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
+            return ResponseData.error(jsonObject.getString("msg"));
         }
-        Map map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
+        Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
 
 
         SysUser sysUser = userMapper.selectById(partner);
@@ -536,7 +538,8 @@ public class PackageNewClothes {
 
         order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
-        // SendSmsAndMail.sendSms(contactNumber,"4","4");
+        String url = "https://dx.dianyuanjiangli.com/mobile/#/hhr/handleSuccessful?orderId=" + uuid + "&id=" + sysUser.getId();
+        SendSmsAndMail.sendSms(contactNumber, url, "2");
         if (insert == 1) {
             appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName);
             if(StringUtils.isNotEmpty(isFromRh)){
@@ -545,7 +548,7 @@ public class PackageNewClothes {
             }
             return ResponseData.success(map.get("orderCode").toString());
         }
-        return ResponseData.error("开卡失败！");
+        return ResponseData.success("下单失败！");
     }
 
     /**