首页忘记密码功能以及物资管理sql调整

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -91,7 +91,7 @@
 			left join
 			(select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
 			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0
-			WHERE f.`status` = 5
+			WHERE f.`status` = 5 and e.del_flag = 0
 			GROUP BY e.goods_name) b
 			on a.trade_name = b.goods_name
 

jeeplus-platform/jeeplus-admin/src/main/java/com/jeeplus/sys/controller/LoginController.java

@@ -320,6 +320,9 @@ public class LoginController {
                     //存放验证码
                     //以手机号+为key 五分钟为时效 将验证码进行短期存储
                     redisUtils.setEx(mobile+ "resetPassword", randomCode, 300, TimeUnit.SECONDS);
+                }else if(statusCode.equals("160040")){
+                    j.put("success",false);
+                    j.put("message","手机号获取验证码次数已达每日上限!");
                 }else{
                     j.put("success",false);
                     j.put("message","短信发送失败，错误代码：101，请联系管理员!");
@@ -332,7 +335,7 @@ public class LoginController {
             }
         } else {
             j.put("success",false);
-            j.put("message","当前手机号未注册!");
+            j.put("message","当前手机号未注册!请联系管理员");
         }
         return ResponseEntity.ok(j);
     }