重置登录密码和修改手机号调整

Areas/Api/Controllers/v1/Main1/MerchantInfoController.cs

@@ -100,15 +100,19 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             var Id = int.Parse(MerchantId);
             var query = main1db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            var loginMobile = main1db.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == query.Mobile) ?? new MerchantLoginInfo();
             Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
                 query.LoginPwd = function.MD532(query.Mobile.Substring(query.Mobile.Length - 6, 6)); //登录密码
+                if (loginMobile.Id > 0)
+                {
+                    loginMobile.LoginPwd = query.LoginPwd; //登录密码
+                }
             }
-            main2db.SaveChanges();
+            main1db.SaveChanges();
 
             return new AppResultJson() { Status = "1", Info = "该商户的登录密码已重置为手机号后6位", Data = Obj };
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
 
@@ -132,15 +136,31 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 return new AppResultJson() { Status = "-1", Info = "手机号不正确" };
             }
+            MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + Mobile);
+            if (mobilecheck == null)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            if (mobilecheck.CheckCode != Mobile)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            RedisDbconn.Instance.Clear("MobileCodeCheck:" + Mobile);
             var Id = int.Parse(MerchantId);
             var query = main1db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            var loginMobile = main1db.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == Mobile) ?? new MerchantLoginInfo();
             Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
                 query.Mobile = Mobile;
                 query.LoginPwd = function.MD532(Mobile.Substring(Mobile.Length - 6, 6)); //登录密码
+                if (loginMobile.Id > 0)
+                {
+                    loginMobile.LoginMobile = Mobile;
+                    loginMobile.LoginPwd = query.LoginPwd; //登录密码
+                }
             }
-            main2db.SaveChanges();
+            main1db.SaveChanges();
 
             return new AppResultJson() { Status = "1", Info = "修改成功，新密码默认为该手机号后6位", Data = Obj };
         }

Areas/Api/Controllers/v1/Main2/MerchantInfoController.cs

@@ -93,12 +93,18 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             var Id = int.Parse(MerchantId);
             var query = main2db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            var loginMobile = main1db.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == query.Mobile) ?? new Models.Main1.MerchantLoginInfo();
             Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
                 query.LoginPwd = function.MD532(query.Mobile.Substring(query.Mobile.Length - 6, 6)); //登录密码
+                if (loginMobile.Id > 0)
+                {
+                    loginMobile.LoginPwd = query.LoginPwd; //登录密码
+                }
             }
             main2db.SaveChanges();
+            main1db.SaveChanges();
 
             return new AppResultJson() { Status = "1", Info = "该商户的登录密码已重置为手机号后6位", Data = Obj };
         }
@@ -124,15 +130,32 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             {
                 return new AppResultJson() { Status = "-1", Info = "手机号不正确" };
             }
+            MobileCodeCheck mobilecheck = RedisDbconn.Instance.Get<MobileCodeCheck>("MobileCodeCheck:" + Mobile);
+            if (mobilecheck == null)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            if (mobilecheck.CheckCode != Mobile)
+            {
+                return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
+            }
+            RedisDbconn.Instance.Clear("MobileCodeCheck:" + Mobile);
             var Id = int.Parse(MerchantId);
             var query = main2db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
+            var loginMobile = main1db.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == Mobile) ?? new Models.Main1.MerchantLoginInfo();
             Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
                 query.Mobile = Mobile;
                 query.LoginPwd = function.MD532(Mobile.Substring(Mobile.Length - 6, 6)); //登录密码
+                if (loginMobile.Id > 0)
+                {
+                    loginMobile.LoginMobile = Mobile;
+                    loginMobile.LoginPwd = query.LoginPwd; //登录密码
+                }
             }
             main2db.SaveChanges();
+            main1db.SaveChanges();
 
             return new AppResultJson() { Status = "1", Info = "修改成功，新密码默认为该手机号后6位", Data = Obj };
         }