diff --git a/New_College.Api/Controllers/Front/CustomerController.cs b/New_College.Api/Controllers/Front/CustomerController.cs
index 4f88b0c..b0df553 100644
--- a/New_College.Api/Controllers/Front/CustomerController.cs
+++ b/New_College.Api/Controllers/Front/CustomerController.cs
@@ -43,19 +43,23 @@ namespace New_College.Api.Controllers.Front
///
///
[HttpGet]
- public async Task>> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
+ public async Task> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
{
- var userinfo = new List();
+ var userinfo = new List();
var customer = await _fansDistributionServices.Query(c => c.IsDelete == false && c.SaleId == query.CustomerId);
var fansids = customer.Select(c => c.FansId).ToList();
- userinfo = (await _services.Query(c => fansids.Contains(c.Id))).Select(c => new CustomerShareModel()
+ userinfo = (await _services.Query(c => fansids.Contains(c.Id))).Select(c => new CustomerShareItem()
{
Avatar = c.AvatarUrl,
nickName = c.NickName
}).ToList();
- return new MessageModel>()
+ return new MessageModel()
{
- response = userinfo,
+ response = new CustomerShareModel()
+ {
+ ShareItems = userinfo,
+ UnDone = 3 - userinfo.Count()
+ },
success = true,
msg = "ok"
};
diff --git a/New_College.Api/Controllers/OAuthController.cs b/New_College.Api/Controllers/OAuthController.cs
index 74e3665..84a8f33 100644
--- a/New_College.Api/Controllers/OAuthController.cs
+++ b/New_College.Api/Controllers/OAuthController.cs
@@ -7,6 +7,7 @@ using New_College.IServices;
using New_College.Model;
using New_College.Model.ViewModels;
using NPOI.SS.Formula.Functions;
+using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
@@ -99,7 +100,36 @@ namespace New_College.Controllers
response.servicetoken = getaccesstoken.access_token;
var userinfo = CasdoorHttpHelper.Http_Get("/api/userinfo", headers, new Dictionary());
var user = (await _CustomerInfoServices.Query(q => q.UUID == userinfo.sub)).FirstOrDefault();
- if (user != null)
+ if (user == null)
+ {
+ if (!string.IsNullOrWhiteSpace(userinfo.phone))
+ {
+ var baseuser = (await _CustomerInfoServices.Query(q => q.Phone == userinfo.phone)).FirstOrDefault();
+
+ if (baseuser != null)
+ {
+ if (string.IsNullOrEmpty(baseuser.NickName))
+ {
+
+ if (!string.IsNullOrWhiteSpace(baseuser.Phone))
+ {
+ baseuser.NickName = baseuser.Phone;
+ }
+ }
+ baseuser.UUID = userinfo.sub;
+ await _CustomerInfoServices.Update(baseuser);
+ }
+ }
+ else
+ {
+ return new MessageModel()
+ {
+ success = false,
+ msg = "该账户不存在或已注销"
+ };
+ }
+ }
+ else
{
if (string.IsNullOrEmpty(user.NickName))
{
@@ -113,23 +143,13 @@ namespace New_College.Controllers
single.NickName = user.UserCode;
}
await _CustomerInfoServices.Update(single);
- }
- TokenModelJwt tokenModel = new TokenModelJwt { Uid = user.Id, Role = "users" };
- jwtStr = JwtHelper.IssueJwt(tokenModel);
- response.token = jwtStr;
- response.Id = user.Id;
- suc = true;
-
- }
- else
- {
- return new MessageModel()
- {
- success = false,
- msg = "该账户不存在或已注销"
-
- };
+ }
}
+ TokenModelJwt tokenModel = new TokenModelJwt { Uid = user.Id, Role = "users" };
+ jwtStr = JwtHelper.IssueJwt(tokenModel);
+ response.token = jwtStr;
+ response.Id = user.Id;
+ suc = true;
return new MessageModel()
{
success = suc,
diff --git a/New_College.Api/New_College.Model.xml b/New_College.Api/New_College.Model.xml
index 7916423..9c5b912 100644
--- a/New_College.Api/New_College.Model.xml
+++ b/New_College.Api/New_College.Model.xml
@@ -5750,6 +5750,11 @@
创建时间
+
+
+ 未完成人数
+
+
返回状态1成功 2验证码错误 3失败
diff --git a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
index 97ccdce..51c659a 100644
--- a/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
+++ b/New_College.Model/ViewModels/Result/CustomerInfoResult.cs
@@ -8,7 +8,16 @@ namespace New_College.Model.ViewModels
public class CustomerShareModel
{
- public string Avatar{ get; set; }
+ ///
+ /// 未完成人数
+ ///
+ public int UnDone { get; set; }
+
+ public List ShareItems { get; set; }
+ }
+ public class CustomerShareItem
+ {
+ public string Avatar { get; set; }
public string nickName { get; set; }
}