feat:bug 待修复

New_College.Api/Controllers/Front/CustomerController.cs

@@ -43,19 +43,23 @@ namespace New_College.Api.Controllers.Front
         /// <param name="query"></param>
         /// <returns></returns>
         [HttpGet]
-        public async Task<MessageModel<List<CustomerShareModel>>> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
+        public async Task<MessageModel<CustomerShareModel>> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
         {
-            var userinfo = new List<CustomerShareModel>();
+            var userinfo = new List<CustomerShareItem>();
             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<List<CustomerShareModel>>()
+            return new MessageModel<CustomerShareModel>()
             {
-                response = userinfo,
+                response = new CustomerShareModel()
+                {
+                    ShareItems = userinfo,
+                    UnDone = 3 - userinfo.Count()
+                },
                 success = true,
                 msg = "ok"
             };

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<CasdoorUserInfoDto>("/api/userinfo", headers, new Dictionary<string, string>());
             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<CasDoorToken>()
+                    {
+                        success = false,
+                        msg = "该账户不存在或已注销"
+                    };
+                }
+            }
+            else
             {
                 if (string.IsNullOrEmpty(user.NickName))
                 {
@@ -114,22 +144,12 @@ namespace New_College.Controllers
                     }
                     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<CasDoorToken>()
-                {
-                    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<CasDoorToken>()
             {
                 success = suc,

New_College.Api/New_College.Model.xml

@@ -5750,6 +5750,11 @@
             创建时间
             </summary>
         </member>
+        <member name="P:New_College.Model.ViewModels.CustomerShareModel.UnDone">
+            <summary>
+            未完成人数
+            </summary>
+        </member>
         <member name="P:New_College.Model.ViewModels.CustomerInfoResult.Status">
             <summary>
             返回状态1成功  2验证码错误  3失败

New_College.Model/ViewModels/Result/CustomerInfoResult.cs

@@ -8,7 +8,16 @@ namespace New_College.Model.ViewModels
 
     public class CustomerShareModel
     {
-        public string Avatar{ get; set; }
+        /// <summary>
+        /// 未完成人数
+        /// </summary>
+        public int UnDone { get; set; }
+
+        public List<CustomerShareItem> ShareItems { get; set; }
+    }
+    public class CustomerShareItem
+    {
+        public string Avatar { get; set; }
 
         public string nickName { get; set; }
     }