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

调整代码框架

develop
old易 2024-11-13 17:28:33 +08:00
parent 304a4ec026
commit ea50a2d266
10 changed files with 121 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,28 +46,28 @@ namespace New_College.Api.Controllers.Front
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<CustomerShareModel>> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
{
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 CustomerShareItem()
{
Avatar = c.AvatarUrl,
nickName = c.NickName
}).ToList();
return new MessageModel<CustomerShareModel>()
{
response = new CustomerShareModel()
{
ShareItems = userinfo,
UnDone = 3 - userinfo.Count()
},
success = true,
msg = "ok"
};
}
//[HttpGet]
//public async Task<MessageModel<CustomerShareModel>> ShareTaskFinshing([FromQuery] CustomerShareQuery query)
//{
//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 CustomerShareItem()
//{
// Avatar = c.AvatarUrl,
// nickName = c.NickName
//}).ToList();
//return new MessageModel<CustomerShareModel>()
//{
// response = new CustomerShareModel()
// {
// ShareItems = userinfo,
// UnDone = 3 - userinfo.Count()
// },
// success = true,
// msg = "ok"
//};
// }
/// <summary>
///
/// </summary>
@ -250,10 +250,10 @@ namespace New_College.Api.Controllers.Front
{
try
{
Task.Run(async () =>
{
await DistrFanc(request.SaleId, customerinfo.Id);
});
//Task.Run(async () =>
// {
//await DistrFanc(request.SaleId, customerinfo.Id);
// });
// newId = await updatesync(customerinfo.Phone);
}
@ -320,7 +320,7 @@ namespace New_College.Api.Controllers.Front
var firstinfo = customer.FirstOrDefault(e => !string.IsNullOrWhiteSpace(e.UUID) && e.IsDelete == false && string.IsNullOrWhiteSpace(e.GZOpenId));
if (firstinfo != null)
{
newId = firstinfo.Id;
// newId = firstinfo.Id;
var endinfo = customer.FirstOrDefault(e => e.Id != firstinfo.Id);
firstinfo.IsVIP = endinfo.IsVIP ? true : firstinfo.IsVIP;
firstinfo.Subject = endinfo.Subject;

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

@ -69,10 +69,12 @@ namespace New_College.Controllers
//没有用户则注册一个新用户
user = new Model.Models.V_CustomerInfo()
{
Id = userinfo.result.Id,
IsDelete = false,
UUID = userinfo.result.UnionId,
Phone = userinfo.result.Mobile,
GZOpenId = userinfo.result.OpenId,
OpenId = userinfo.result.OpenId,
CreateTime = DateTime.Now,
IsVIP = true,//默认不收费
Gender = 0,
@ -98,8 +100,9 @@ namespace New_College.Controllers
}
await _CustomerInfoServices.Update(user);
}
if (string.IsNullOrEmpty(user.NickName)) {
user.NickName = "学霸"+ RadomHelper.RandNum(4);
if (string.IsNullOrEmpty(user.NickName))
{
user.NickName = "学霸" + RadomHelper.RandNum(4);
}
var tokenModel = new SSOTokenModelJwt { UserId = user.Id.ToString(), NickName = user.NickName, LoginMode = LoginModeEnum.APP.ToString() };
jwtStr = JwtHelper.ssoIssueJwt(tokenModel);

31
New_College.Api/New_College.Model.xml
View File

@ -2041,6 +2041,37 @@
租户id
</summary>
</member>
<member name="P:New_College.Model.Models.DEntityUserTenant.TenantId">
<summary>
租户id
</summary>
</member>
<member name="T:New_College.Model.Models.EntityUserModel">
<summary>
不带创建人BaseModel
</summary>
</member>
<member name="P:New_College.Model.Models.EntityUserModel.Id">
<summary>
ID
</summary>
</member>
<member name="P:New_College.Model.Models.EntityUserModel.OrderSort">
<summary>
排序
</summary>
</member>
<member name="P:New_College.Model.Models.EntityUserModel.CreateTime">
<summary>
创建时间
</summary>
</member>
<!-- Badly formed XML comment ignored for member "P:New_College.Model.Models.EntityUserModel.ModifyTime" -->
<member name="P:New_College.Model.Models.EntityUserModel.IsDelete">
<summary>
是否删除
</summary>
</member>
<member name="T:New_College.Model.Models.EntityModel">
<summary>
不带创建人BaseModel

7
New_College.Api/New_College.xml
View File

@ -239,13 +239,6 @@
服务器接口，因为是模板生成，所以首字母是大写的，自己可以重构下
</summary>
</member>
<member name="M:New_College.Api.Controllers.Front.CustomerController.ShareTaskFinshing(New_College.Model.Request.CustomerShareQuery)">
<summary>
获取分享好友任务完成情况
</summary>
<param name="query"></param>
<returns></returns>
</member>
<member name="M:New_College.Api.Controllers.Front.CustomerController.SyncCustomerInfo(New_College.Model.SyncCustomerDto)">
<summary>

2
New_College.IServices/IV_CustomerInfoServices.cs
View File

@ -55,7 +55,7 @@ namespace New_College.IServices
/// </summary>
/// <param name="openid"></param>
/// <returns></returns>
Task<int> GetCustomerId(string OpenId);
Task<long> GetCustomerId(string OpenId);
/// <summary>
/// 通过用户id获取openid
/// </summary>

48
New_College.Model/Models/RootEntity.cs
View File

@ -78,6 +78,54 @@ namespace New_College.Model.Models
}
public abstract class DEntityUserTenant : EntityUserModel
{
/// <summary>
/// 租户id
/// </summary>
public virtual long? TenantId { get; set; }
}
/// <summary>
/// 不带创建人BaseModel
/// </summary>
public partial class EntityUserModel
{
/// <summary>
/// ID
/// </summary>
[SugarColumn(IsNullable = false, IsPrimaryKey = true)]
public long Id { get; set; }
/// <summary>
///排序
/// </summary>
public int OrderSort { get; set; }
/// <summary>
/// 创建时间
/// </summary>
[SugarColumn(IsNullable = true)]
public DateTime? CreateTime { get; set; } = TimeUtil.GetCstDateTime();
/// <summary>
/// <summary>
/// 修改时间
/// </summary>
[SugarColumn(IsNullable = true)]
public DateTime? ModifyTime { get; set; } = TimeUtil.GetCstDateTime();
/// <summary>
/// 是否删除
/// </summary>
public bool IsDelete { get; set; }
}
/// <summary>
/// 不带创建人BaseModel
/// </summary>

5
New_College.Model/Models/V_CustomerInfo.cs
View File

@ -7,7 +7,10 @@ using System.Text;
namespace New_College.Model.Models
{
public class V_CustomerInfo : DEntityTenant
public class V_CustomerInfo : DEntityUserTenant
{
/// <summary>
/// 用户头像

2
New_College.Model/ViewModels/Result/CasDoorTokenResult.cs
View File

@ -215,7 +215,7 @@ namespace New_College.Model.ViewModels
public class CasDoorToken
{
public int Id { get; set; }
public long Id { get; set; }
public string token { get; set; }
public string servicetoken { get; set; }

4
New_College.Model/ViewModels/Result/CustomerInfoResult.cs
View File

@ -76,7 +76,7 @@ namespace New_College.Model.ViewModels
/// </summary>
public int Status { get; set; }
public int Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 小程序openid
@ -170,7 +170,7 @@ namespace New_College.Model.ViewModels
/// <summary>
/// 编号id
/// </summary>
public int Id { get; set; }
public long Id { get; set; }
/// <summary>
/// 用户名

2
New_College.Services/V_CustomerInfoServices.cs
View File

@ -666,7 +666,7 @@ namespace New_College.Services
}
}
public async Task<int> GetCustomerId(string OpenId)
public async Task<long> GetCustomerId(string OpenId)
{
var customerinfo = await _dal.Query(x => x.IsDelete == false && x.OpenId == OpenId);
if (customerinfo.Count == 0)