yly
/
NewGaoKaoApi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://192.168.100.104:49153/Volunteer/newgaokao into develop

develop
old易 2024-07-09 10:34:55 +08:00
parent a77c80d023 baaa23e4f9
commit 128b2ff4d3
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
New_College.Api/Controllers/Front/CustomerController.cs
View File

@ -315,6 +315,9 @@ namespace New_College.Api.Controllers.Front
newId = firstinfo.Id; newId = firstinfo.Id;
var endinfo = customer.FirstOrDefault(e => e.Id != firstinfo.Id); var endinfo = customer.FirstOrDefault(e => e.Id != firstinfo.Id);
firstinfo.IsVIP = endinfo.IsVIP ? true : firstinfo.IsVIP; firstinfo.IsVIP = endinfo.IsVIP ? true : firstinfo.IsVIP;
firstinfo.Subject = endinfo.Subject;
firstinfo.subjectgroupName = endinfo.subjectgroupName;
firstinfo.Subjectgroup = endinfo.Subjectgroup;
firstinfo.OpenId = endinfo.OpenId; firstinfo.OpenId = endinfo.OpenId;
//firstinfo.UserPwd = endinfo.UserPwd; //firstinfo.UserPwd = endinfo.UserPwd;
//firstinfo.Salt= endinfo.Salt; //firstinfo.Salt= endinfo.Salt;

3
New_College.Api/Controllers/OAuthController.cs
View File

@ -134,7 +134,8 @@ namespace New_College.Controllers
OpenId = userinfo.aud, OpenId = userinfo.aud,
CreateTime = DateTime.UtcNow, CreateTime = DateTime.UtcNow,
IsVIP = false, IsVIP = false,
Gender = 0 Gender = 0,
Subject = 1
}; };
user.Id = await _CustomerInfoServices.Add(user); user.Id = await _CustomerInfoServices.Add(user);