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

bug fixed

develop
old yi 2024-03-29 22:14:59 +08:00
parent b421c0df7a
commit 7f6c0ad7fa
3 changed files with 63 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
New_College.Api/Dockerfile.original
View File

@ -1,4 +1,4 @@
FROM swr.cn-south-1.myhuaweicloud.com/mcr/aspnet:3.1-alpine FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
RUN echo 'Asia/Shanghai' >/etc/timezone RUN echo 'Asia/Shanghai' >/etc/timezone
@ -32,5 +32,5 @@ RUN echo 'Asia/Shanghai' >/etc/timezone
#&& supervisord -c /etc/supervisord.conf #&& supervisord -c /etc/supervisord.conf
WORKDIR /app WORKDIR /app
COPY . . COPY . .
EXPOSE 8083 EXPOSE 8082
ENTRYPOINT ["dotnet", "New_College.Api.dll","-b","0.0.0.0"] ENTRYPOINT ["dotnet", "New_College.Api.dll","-b","0.0.0.0"]

13
New_College.Common/XiaoETong/XiaoEtongApp.cs
View File

@ -41,10 +41,15 @@ namespace New_College
/// <returns></returns> /// <returns></returns>
public static usersobject GetUsersList(UserRequest request) public static usersobject GetUsersList(UserRequest request)
{ {
var access_token = xetong_token().data.access_token; var tokeninfo = xetong_token();
request.access_token = access_token; if (tokeninfo.data != null)
var result = HttpHelper.PostApi<usersobject>(XIAOETongConfig.base_url + "xe.user.batch.get/1.0.0", request); {
return result; var access_token = tokeninfo.data.access_token;
request.access_token = access_token;
var result = HttpHelper.PostApi<usersobject>(XIAOETongConfig.base_url + "xe.user.batch.get/1.0.0", request);
return result;
} else
return null;
} }

96
New_College.Services/V_CustomerInfoServices.cs
View File

@ -355,7 +355,7 @@ namespace New_College.Services
string typename = "综合"; string typename = "综合";
if (info.subjectgroupName != null) if (info.subjectgroupName != null)
{ {
typename = info.subjectgroupName.Length > 2 ? "综合" : info.subjectgroupName; typename = info.subjectgroupName.Length > 2 ? "综合" : info.subjectgroupName;
} }
var batchlist = await t_BatchlineRepository.Query(c => c.Year == years && c.AreaName == info.AreaName && c.Type_name == typename); var batchlist = await t_BatchlineRepository.Query(c => c.Year == years && c.AreaName == info.AreaName && c.Type_name == typename);
@ -425,57 +425,65 @@ namespace New_College.Services
/// <returns></returns> /// <returns></returns>
private async Task<V_CustomerInfo> SyncXET(V_CustomerInfo info) private async Task<V_CustomerInfo> SyncXET(V_CustomerInfo info)
{ {
if (!string.IsNullOrWhiteSpace(info.Phone)) try
{ {
var xet = XiaoEtongApp.GetUsersList(new UserRequest() if (!string.IsNullOrWhiteSpace(info.Phone))
{ {
phone = info.Phone, var xet = XiaoEtongApp.GetUsersList(new UserRequest()
page = 1,
page_size = 1,
});
if (xet != null && xet.data.list != null && xet.data.list.Count() > 0)
{
var xiaoetong = (await _XiaoEtongUserRepository.Query(e => e.collect_phone == info.Phone));
if (!xiaoetong.Any())
{ {
await _XiaoEtongUserRepository.Add(new D_XiaoEtongUser() phone = info.Phone,
page = 1,
page_size = 1,
});
if (xet != null && xet.data.list != null && xet.data.list.Count() > 0)
{
var xiaoetong = (await _XiaoEtongUserRepository.Query(e => e.collect_phone == info.Phone));
if (!xiaoetong.Any())
{ {
avatar = xet.data.list.First().avatar, await _XiaoEtongUserRepository.Add(new D_XiaoEtongUser()
bind_phone = xet.data.list.First().bind_phone, {
collect_phone = xet.data.list.First().collect_phone, avatar = xet.data.list.First().avatar,
CreateBy = "system", bind_phone = xet.data.list.First().bind_phone,
CreateTime = DateTime.Now, collect_phone = xet.data.list.First().collect_phone,
from = xet.data.list.First().from, CreateBy = "system",
IsDelete = false, CreateTime = DateTime.Now,
ModifyBy = "system", from = xet.data.list.First().from,
ModifyTime = DateTime.Now, IsDelete = false,
OrderSort = 0, ModifyBy = "system",
pay_sum = xet.data.list.First().pay_sum, ModifyTime = DateTime.Now,
punch_count = xet.data.list.First().punch_count, OrderSort = 0,
user_created_at = xet.data.list.First().user_created_at, pay_sum = xet.data.list.First().pay_sum,
user_nickname = xet.data.list.First().user_nickname, punch_count = xet.data.list.First().punch_count,
wx_app_open_id = xet.data.list.First().wx_app_open_id, user_created_at = xet.data.list.First().user_created_at,
wx_open_id = xet.data.list.First().wx_open_id, user_nickname = xet.data.list.First().user_nickname,
wx_union_id = xet.data.list.First().wx_union_id, wx_app_open_id = xet.data.list.First().wx_app_open_id,
user_id = xet.data.list.First().user_id wx_open_id = xet.data.list.First().wx_open_id,
}); wx_union_id = xet.data.list.First().wx_union_id,
var orders = XiaoEtongApp.GetOrdersList(new XETOrdersRequest() user_id = xet.data.list.First().user_id
{ });
page = 1, var orders = XiaoEtongApp.GetOrdersList(new XETOrdersRequest()
page_size = 30, {
user_id = xet.data.list.First().user_id page = 1,
}); page_size = 30,
if (orders.data.list.Any() && orders.data.list.Count() > 0 && !info.IsVIP) user_id = xet.data.list.First().user_id
{ });
var isvip = orders.data.list.Select(c => c.order_info).Where(e => e.activity_type_bitmap.Contains(11)); if (orders.data.list.Any() && orders.data.list.Count() > 0 && !info.IsVIP)
info.IsVIP = isvip.Count() > 0 ? true : false; {
info.ModifyTime = DateTime.Now; var isvip = orders.data.list.Select(c => c.order_info).Where(e => e.activity_type_bitmap.Contains(11));
await _dal.Update(info); info.IsVIP = isvip.Count() > 0 ? true : false;
info.ModifyTime = DateTime.Now;
await _dal.Update(info);
}
} }
} }
} }
}
}
catch (Exception exx)
{
}
return info; return info;
} }