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

bug fixed

develop
old易 2024-03-18 11:34:47 +08:00
parent 92b495b9f6
commit cd89c589ce
3 changed files with 50 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -896,6 +896,11 @@
学校
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorScoreLine.SubjectType">
<summary>
综合/理科/文科
</summary>
</member>
<member name="P:New_College.Model.Models.D_PlanMajorScoreLine.BatchName">
<summary>
批次

6
New_College.Model/Models/D_PlanMajorScoreLine.cs
View File

@ -29,6 +29,12 @@ namespace New_College.Model.Models
public string UniversityName { get; set; }
/// <summary>
/// 综合/理科/文科
/// </summary>
public string SubjectType { get; set; }
/// <summary>
/// 批次
/// </summary>

75
New_College.Services/V_CustomerInfoServices.cs
View File

@ -18,6 +18,7 @@ using Newtonsoft.Json;
using New_College.Common.HttpRestSharp;
using StackExchange.Profiling.Internal;
using New_College.Repository;
using System.Xml.Linq;
namespace New_College.Services
{
@ -368,50 +369,52 @@ namespace New_College.Services
/// <returns></returns>
private async Task<V_CustomerInfo> SyncXET(V_CustomerInfo info)
{
if (!string.IsNullOrWhiteSpace(info.Phone)) {
var xet = XiaoEtongApp.GetUsersList(new UserRequest()
{
phone = info.Phone,
page = 1,
page_size = 1,
});
if (xet.data.list != null && xet.data.list.Count() > 0)
{
var xiaoetong = (await _XiaoEtongUserRepository.Query(e => e.collect_phone == info.Phone));
if (!xiaoetong.Any())
if (xet != null && xet.data.list != null && xet.data.list.Count() > 0)
{
await _XiaoEtongUserRepository.Add(new D_XiaoEtongUser()
var xiaoetong = (await _XiaoEtongUserRepository.Query(e => e.collect_phone == info.Phone));
if (!xiaoetong.Any())
{
avatar = xet.data.list.First().avatar,
bind_phone = xet.data.list.First().bind_phone,
collect_phone = xet.data.list.First().collect_phone,
CreateBy = "system",
CreateTime = DateTime.Now,
from = xet.data.list.First().from,
IsDelete = false,
ModifyBy = "system",
ModifyTime = DateTime.Now,
OrderSort = 0,
pay_sum = xet.data.list.First().pay_sum,
punch_count = xet.data.list.First().punch_count,
user_created_at = xet.data.list.First().user_created_at,
user_nickname = xet.data.list.First().user_nickname,
wx_app_open_id = xet.data.list.First().wx_app_open_id,
wx_open_id = xet.data.list.First().wx_open_id,
wx_union_id = xet.data.list.First().wx_union_id,
user_id = xet.data.list.First().user_id
});
var orders = XiaoEtongApp.GetOrdersList(new XETOrdersRequest()
{
page = 1,
page_size = 30,
user_id = xet.data.list.First().user_id
});
if (orders.data.list.Any() && orders.data.list.Count() > 0 && !info.IsVIP)
{
var isvip = orders.data.list.Select(c => c.order_info).Where(e => e.activity_type_bitmap.Contains(11));
info.IsVIP = isvip.Count() > 0 ? true : false;
info.ModifyTime = DateTime.Now;
await _dal.Update(info);
await _XiaoEtongUserRepository.Add(new D_XiaoEtongUser()
{
avatar = xet.data.list.First().avatar,
bind_phone = xet.data.list.First().bind_phone,
collect_phone = xet.data.list.First().collect_phone,
CreateBy = "system",
CreateTime = DateTime.Now,
from = xet.data.list.First().from,
IsDelete = false,
ModifyBy = "system",
ModifyTime = DateTime.Now,
OrderSort = 0,
pay_sum = xet.data.list.First().pay_sum,
punch_count = xet.data.list.First().punch_count,
user_created_at = xet.data.list.First().user_created_at,
user_nickname = xet.data.list.First().user_nickname,
wx_app_open_id = xet.data.list.First().wx_app_open_id,
wx_open_id = xet.data.list.First().wx_open_id,
wx_union_id = xet.data.list.First().wx_union_id,
user_id = xet.data.list.First().user_id
});
var orders = XiaoEtongApp.GetOrdersList(new XETOrdersRequest()
{
page = 1,
page_size = 30,
user_id = xet.data.list.First().user_id
});
if (orders.data.list.Any() && orders.data.list.Count() > 0 && !info.IsVIP)
{
var isvip = orders.data.list.Select(c => c.order_info).Where(e => e.activity_type_bitmap.Contains(11));
info.IsVIP = isvip.Count() > 0 ? true : false;
info.ModifyTime = DateTime.Now;
await _dal.Update(info);
}
}
}
}