Skip to content

H
huatu_API
Commit 3f3b7e79 authored by 吴春's avatar 吴春
Browse files
Options

1

parent d60b9707
Hide whitespace changes
Inline Side-by-side
Showing with 336 additions and 205 deletions
REBORN.Module.DMCModule/VisaModule.cs
View file @ 3f3b7e79
......@@ -2619,7 +2619,7 @@ TEL:03-3779-9111";
{
return ApiResult.Success("请选择需要导入的EXCEL!");
}
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1);
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1)?.Distinct()?.ToList()??new List<Data.Guest.ImpoertGuest>();
if (orderId > 0)
{
var trans = GuestRepository.DbTransaction;
......@@ -2738,7 +2738,7 @@ TEL:03-3779-9111";
return false;
}
}
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", Name = subItem.Name, IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
return JsonHelper.GetCamelCaseResultJson(result);
}
......@@ -3086,16 +3086,8 @@ TEL:03-3779-9111";
if (flag)
{
// 获取数据库中的旅客列表并按Id降序排列
var dbGuestList = guestList;
var newGuestList = orderGuestList;
// 创建字典提高查找效率
var dbGuestDict = dbGuestList.ToDictionary(g => g.Name, g => g);
var newGuestDict = newGuestList.ToDictionary(g => g.Name, g => g);
// 找出需要删除的旅客
var guestsToRemove = dbGuestList.Where(g => !newGuestDict.ContainsKey(g.Name)).ToList();
foreach (var guest in guestsToRemove)
foreach (var guest in guestList)
{
Dictionary<string, object> gfiles = new Dictionary<string, object>()
{
......@@ -3111,99 +3103,189 @@ TEL:03-3779-9111";
}
};
GuestRepository.Update(gfiles, gwheres, trans);
}
// 处理新增和修改
foreach (var item in newGuestList)
foreach (var item in orderGuestList)
{
if (dbGuestDict.TryGetValue(item.Name, out var existingGuest))
{
var nowId = guestList?.FirstOrDefault(x => x.Name == item.Name)?.Id ?? 0;
Dictionary<string, object> gfiles = new Dictionary<string, object>()
{
{ nameof(RB_Travel_Guest.Name),item.Name},
{ nameof(RB_Travel_Guest.IdCard),item.IdCard},
{ nameof(RB_Travel_Guest.PassportExpiry),item.PassportExpiry},
{ nameof(RB_Travel_Guest.PassportIssued),item.PassportIssued},
{ nameof(RB_Travel_Guest.PassportNo),item.PassportNo},
{ nameof(RB_Travel_Guest.Birthday),item.Birthday},
{ nameof(RB_Travel_Guest.Tel),item.Tel},
};
List<WhereHelper> gwheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Travel_Guest.Id),
FiledValue=nowId,
OperatorEnum=OperatorEnum.Equal
}
};
GuestRepository.Update(gfiles, gwheres);
}
else
{
// //自动创建名单
var guestModel = new RB_Travel_Guest(); //GuestRepository.GetEntity(model.CRMGuestId);
guestModel.Name = item.Name;
guestModel.Birthday = item.Birthday;
guestModel.IdCard = item.IdCard;
guestModel.Tel = item.Tel;
guestModel.PassportNo = item.PassportNo;
guestModel.PassportExpiry = item.PassportExpiry;
guestModel.PassportIssued = item.PassportIssued;
guestModel.Id = 0;
guestModel.TCID = VisaProductModel.Id;
guestModel.OrderId = visaOrderId;
guestModel.VisaPlanId = planid;
guestModel.Remarks = guestModel.Remarks;
guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
guestModel.CreateBy = model.UpdateBy;
guestModel.CreateDate = DateTime.Now;
guestModel.UpdateBy = model.UpdateBy;
guestModel.UpdateDate = DateTime.Now;
guestModel.VisaManageStatus = 1;
guestModel.VisaCountryType = VisaProductModel.VisaManagementId;
guestModel.VisaType = VisaProductModel.VisaType;
guestModel.VisaState = 0;
guestModel.IsAllograph = 1;
guestModel.CreateBy = model.CreateBy;
guestModel.CreateDate = DateTime.Now;
guestModel.IsHightSchool = 2;
guestModel.IsRecommend = 2;
guestModel.Marriage = VisaMarriageTypeEnum.Other;
guestModel.Address = "";
guestModel.AddressDetail = "";
guestModel.HistoryRecord = "良好";
guestModel.IdentityType = "身份证";
guestModel.Duty = "";
guestModel.IsBed = 0;
guestModel.EconomicCapability = "[]";
guestModel.IssuingAuthority = "";
guestModel.CEName = "";
guestModel.CName = "";
guestModel.CNationality = "中国";
guestModel.UnitAddress = "";
guestModel.UnitName = "";
guestModel.UnitPhone = "";
guestModel.UnitPost = "";
guestModel.Purpose = "";
guestModel.IsDepartureRecord = 0;
guestModel.VisaPlanId = 0;
guestModel.OpenQRCode = 2;
guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
guestModel.IsAllograph = 1;
guestModel.IsVisaFree = 2;
guestModel.IsNeedAirticket = 2;
guestModel.IsNeedSafe = 2;
guestModel.Duty = "";
guestModel.TravelType = 1;
guestModel.UnitType = 1;
guestModel.DutyType = 1;
GuestRepository.Insert(guestModel);
}
//自动创建名单
var guestModel = new RB_Travel_Guest(); //GuestRepository.GetEntity(model.CRMGuestId);
guestModel.Name = item.Name;
guestModel.Birthday = item.Birthday;
guestModel.IdCard = item.IdCard;
guestModel.Tel = item.Tel;
guestModel.PassportNo = item.PassportNo;
guestModel.PassportExpiry = item.PassportExpiry;
guestModel.PassportIssued = item.PassportIssued;
guestModel.Id = 0;
guestModel.TCID = VisaProductModel.Id;
guestModel.OrderId = visaOrderId;
guestModel.VisaPlanId = planid;
guestModel.Remarks = guestModel.Remarks;
guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
guestModel.CreateBy = model.UpdateBy;
guestModel.CreateDate = DateTime.Now;
guestModel.UpdateBy = model.UpdateBy;
guestModel.UpdateDate = DateTime.Now;
guestModel.VisaManageStatus = 1;
guestModel.VisaCountryType = VisaProductModel.VisaManagementId;
guestModel.VisaType = VisaProductModel.VisaType;
guestModel.VisaState = 0;
guestModel.IsAllograph = 1;
guestModel.CreateBy = model.CreateBy;
guestModel.CreateDate = DateTime.Now;
guestModel.IsHightSchool = 2;
guestModel.IsRecommend = 2;
guestModel.Marriage = VisaMarriageTypeEnum.Other;
guestModel.Address = "";
guestModel.AddressDetail = "";
guestModel.HistoryRecord = "良好";
guestModel.IdentityType = "身份证";
guestModel.Duty = "";
guestModel.IsBed = 0;
guestModel.EconomicCapability = "[]";
guestModel.IssuingAuthority = "";
guestModel.CEName = "";
guestModel.CName = "";
guestModel.CNationality = "中国";
guestModel.UnitAddress = "";
guestModel.UnitName = "";
guestModel.UnitPhone = "";
guestModel.UnitPost = "";
guestModel.Purpose = "";
guestModel.IsDepartureRecord = 0;
guestModel.VisaPlanId = 0;
guestModel.OpenQRCode = 2;
guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
guestModel.IsAllograph = 1;
guestModel.IsVisaFree = 2;
guestModel.IsNeedAirticket = 2;
guestModel.IsNeedSafe = 2;
guestModel.Duty = "";
guestModel.TravelType = 1;
guestModel.UnitType = 1;
guestModel.DutyType = 1;
GuestRepository.Insert(guestModel, trans);
}
#region 注释
//var dbGuestList = guestList;
//var newGuestList = orderGuestList;
//// 创建字典提高查找效率
//var dbGuestDict = dbGuestList?.Distinct()?.ToDictionary(g => g.Name, g => g);
//var newGuestDict = newGuestList?.Distinct()?.ToDictionary(g => g.Name, g => g);
//// 找出需要删除的旅客
//var guestsToRemove = dbGuestList.Where(g => !newGuestDict.ContainsKey(g.Name)).ToList();
//foreach (var guest in guestsToRemove)
//{
// Dictionary<string, object> gfiles = new Dictionary<string, object>()
// {
// { nameof(RB_Travel_Guest.Status),1}
// };
// List<WhereHelper> gwheres = new List<WhereHelper>()
// {
// new WhereHelper()
// {
// FiledName=nameof(RB_Travel_Guest.Id),
// FiledValue=guest.Id,
// OperatorEnum=OperatorEnum.Equal
// }
// };
// GuestRepository.Update(gfiles, gwheres, trans);
//}
//// 处理新增和修改
//foreach (var item in newGuestList)
//{
// if (dbGuestDict.TryGetValue(item.Name, out var existingGuest))
// {
// var nowId = guestList?.FirstOrDefault(x => x.Name == item.Name)?.Id ?? 0;
// Dictionary<string, object> gfiles = new Dictionary<string, object>()
// {
// { nameof(RB_Travel_Guest.Name),item.Name},
// { nameof(RB_Travel_Guest.IdCard),item.IdCard},
// { nameof(RB_Travel_Guest.PassportExpiry),item.PassportExpiry},
// { nameof(RB_Travel_Guest.PassportIssued),item.PassportIssued},
// { nameof(RB_Travel_Guest.PassportNo),item.PassportNo},
// { nameof(RB_Travel_Guest.Birthday),item.Birthday},
// { nameof(RB_Travel_Guest.Tel),item.Tel},
// };
// List<WhereHelper> gwheres = new List<WhereHelper>()
// {
// new WhereHelper()
// {
// FiledName=nameof(RB_Travel_Guest.Id),
// FiledValue=nowId,
// OperatorEnum=OperatorEnum.Equal
// }
// };
// GuestRepository.Update(gfiles, gwheres);
// }
// else
// {
// // //自动创建名单
// var guestModel = new RB_Travel_Guest(); //GuestRepository.GetEntity(model.CRMGuestId);
// guestModel.Name = item.Name;
// guestModel.Birthday = item.Birthday;
// guestModel.IdCard = item.IdCard;
// guestModel.Tel = item.Tel;
// guestModel.PassportNo = item.PassportNo;
// guestModel.PassportExpiry = item.PassportExpiry;
// guestModel.PassportIssued = item.PassportIssued;
// guestModel.Id = 0;
// guestModel.TCID = VisaProductModel.Id;
// guestModel.OrderId = visaOrderId;
// guestModel.VisaPlanId = planid;
// guestModel.Remarks = guestModel.Remarks;
// guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
// guestModel.CreateBy = model.UpdateBy;
// guestModel.CreateDate = DateTime.Now;
// guestModel.UpdateBy = model.UpdateBy;
// guestModel.UpdateDate = DateTime.Now;
// guestModel.VisaManageStatus = 1;
// guestModel.VisaCountryType = VisaProductModel.VisaManagementId;
// guestModel.VisaType = VisaProductModel.VisaType;
// guestModel.VisaState = 0;
// guestModel.IsAllograph = 1;
// guestModel.CreateBy = model.CreateBy;
// guestModel.CreateDate = DateTime.Now;
// guestModel.IsHightSchool = 2;
// guestModel.IsRecommend = 2;
// guestModel.Marriage = VisaMarriageTypeEnum.Other;
// guestModel.Address = "";
// guestModel.AddressDetail = "";
// guestModel.HistoryRecord = "良好";
// guestModel.IdentityType = "身份证";
// guestModel.Duty = "";
// guestModel.IsBed = 0;
// guestModel.EconomicCapability = "[]";
// guestModel.IssuingAuthority = "";
// guestModel.CEName = "";
// guestModel.CName = "";
// guestModel.CNationality = "中国";
// guestModel.UnitAddress = "";
// guestModel.UnitName = "";
// guestModel.UnitPhone = "";
// guestModel.UnitPost = "";
// guestModel.Purpose = "";
// guestModel.IsDepartureRecord = 0;
// guestModel.VisaPlanId = 0;
// guestModel.OpenQRCode = 2;
// guestModel.ApplyStatus = VisaApplyStatusTypeEnum.NO;
// guestModel.IsAllograph = 1;
// guestModel.IsVisaFree = 2;
// guestModel.IsNeedAirticket = 2;
// guestModel.IsNeedSafe = 2;
// guestModel.Duty = "";
// guestModel.TravelType = 1;
// guestModel.UnitType = 1;
// guestModel.DutyType = 1;
// GuestRepository.Insert(guestModel);
// }
//}
#endregion
try
{
......
REBORN.Module.SellModule/CustomerOrderModule.cs
View file @ 3f3b7e79
......@@ -3120,7 +3120,7 @@ namespace REBORN.Module.SellModule
{
return ApiResult.Success("请选择需要导入的EXCEL!");
}
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1);
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1)?.Distinct()?.ToList() ?? new List<Data.Guest.ImpoertGuest>();
if (orderId > 0)
{
......@@ -3203,7 +3203,7 @@ namespace REBORN.Module.SellModule
return false;
}
}
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", IdCard = subItem?.IdCard ?? "", Name = subItem.Name, PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
return JsonHelper.GetCamelCaseResultJson(result);
}
......@@ -3344,8 +3344,8 @@ namespace REBORN.Module.SellModule
{ nameof(RB_Customer_TicketOrder_Extend.Money), demodel.Money},
{ nameof(RB_Customer_TicketOrder_Extend.SelffetchAddress), demodel.SelffetchAddress},
{ nameof(RB_Customer_TicketOrder_Extend.FinalPriceTips), demodel.FinalPriceTips},
{ nameof(RB_Customer_TicketOrder_Extend.UseDate), demodel.UseDate},
{ nameof(RB_Customer_TicketOrder_Extend.UseDate), demodel.UseDate},
{ nameof(RB_Customer_TicketOrder_Extend.GuestInfo), demodel.GuestInfo},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
......
REBORN.Module.SellModule/SellOrderModule.cs
View file @ 3f3b7e79
......@@ -5228,36 +5228,7 @@ namespace REBORN.Module.SellModule
};
var guestList = GuestRepository.GetPeopleList(dmodel1).OrderByDescending(x => x.Id).ToList();
//if (dmodel.GuestNum < tomodel.GuestNum)//小于之前的人数就删除
//{
// int deleteNum = guestList.Count() - (dmodel.GuestNum ?? 0);
// if (deleteNum > 0)
// {
// if (dmodel.GuestNum > 0)
// {
// orderRepository.DBSession.Commit();
// return "有多余旅客名单，请先删除后再试！";
// }
// else
// {
// }
// }
//}
// 获取数据库中的旅客列表并按Id降序排列
var dbGuestList = guestList;
var newGuestList = dmodel.GuestList;
// 创建字典提高查找效率
var dbGuestDict = dbGuestList.ToDictionary(g => g.Name, g => g);
var newGuestDict = newGuestList.ToDictionary(g => g.Name, g => g);
// 找出需要删除的旅客
var guestsToRemove = dbGuestList.Where(g => !newGuestDict.ContainsKey(g.Name)).ToList();
foreach (var guest in guestsToRemove)
foreach (var guest in guestList)
{
Dictionary<string, object> gfiles = new Dictionary<string, object>()
{
......@@ -5272,70 +5243,134 @@ namespace REBORN.Module.SellModule
OperatorEnum=OperatorEnum.Equal
}
};
GuestRepository.Update(gfiles, gwheres, trans);
GuestRepository.Update(gfiles, gwheres);
}
// 处理新增和修改
foreach (var newGuest in newGuestList)
foreach (var newGuest in dmodel.GuestList)
{
if (dbGuestDict.TryGetValue(newGuest.Name, out var existingGuest))
GuestRepository.Insert(new RB_Travel_Guest()
{
var nowGuest = guestList.FirstOrDefault(x => x.Name == newGuest.Name) ?? new RB_Travel_Guest_Extend();
Dictionary<string, object> gfiles = new Dictionary<string, object>()
{
{ nameof(RB_Travel_Guest.Name),newGuest.Name},
{ nameof(RB_Travel_Guest.IdCard),newGuest.IdCard},
{ nameof(RB_Travel_Guest.PassportExpiry),newGuest.PassportExpiry},
{ nameof(RB_Travel_Guest.PassportIssued),newGuest.PassportIssued},
{ nameof(RB_Travel_Guest.PassportNo),newGuest.PassportNo},
{ nameof(RB_Travel_Guest.Birthday),newGuest.Birthday},
{ nameof(RB_Travel_Guest.Tel),newGuest.Tel},
};
List<WhereHelper> gwheres = new List<WhereHelper>()
{
new WhereHelper()
{
FiledName=nameof(RB_Travel_Guest.Id),
FiledValue=nowGuest.Id,
OperatorEnum=OperatorEnum.Equal
}
};
GuestRepository.Update(gfiles, gwheres);
}
else
{
// 新增记录
GuestRepository.Insert(new RB_Travel_Guest()
{
Id = 0,
TCID = dmodel.TCID,
OrderId = dmodel.OrderId,
SurName = newGuest.SurName,
Name = newGuest.Name,
Sex = newGuest.Sex,
ESurName = newGuest.ESurName,
EName = newGuest.EName,
Birthday = newGuest.Birthday,
PassportNo = newGuest.PassportNo,
Nationality = newGuest.Nationality ?? 2,//默认中国
EconomicCapability = "[]",
Remarks = newGuest.Remarks,
MobilePhone = newGuest.MobilePhone,
Tel = newGuest.MobilePhone,
Status = 0,
TravelType = 0,
UnitType = 0,
DutyType = 0,
CreateBy = dmodel.CreateBy,
UpdateBy = dmodel.UpdateBy,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now,
IsAllograph = 2,
IsBed = 1
});
}
Id = 0,
TCID = dmodel.TCID,
OrderId = dmodel.OrderId,
SurName = newGuest.SurName,
Name = newGuest.Name,
Sex = newGuest.Sex,
ESurName = newGuest.ESurName,
EName = newGuest.EName,
Birthday = newGuest.Birthday,
PassportNo = newGuest.PassportNo,
Nationality = newGuest.Nationality ?? 2,//默认中国
EconomicCapability = "[]",
Remarks = newGuest.Remarks,
MobilePhone = newGuest.Tel,
Tel = newGuest.Tel,
Status = 0,
TravelType = 0,
UnitType = 0,
DutyType = 0,
CreateBy = dmodel.CreateBy,
UpdateBy = dmodel.UpdateBy,
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now,
IsAllograph = 2,
IsBed = 1,
IdCard=newGuest.IdCard,
PassportExpiry=newGuest.PassportExpiry,
PassportIssued = newGuest.PassportIssued,
});
}
#region 注释代码
//// 获取数据库中的旅客列表并按Id降序排列
//var dbGuestList = guestList;
//var newGuestList = dmodel.GuestList;
//// 创建字典提高查找效率
//var dbGuestDict = dbGuestList?.ToDictionary(g => g.Name, g => g);
//var newGuestDict = newGuestList?.ToDictionary(g => g.Name, g => g);
//// 找出需要删除的旅客
//var guestsToRemove = dbGuestList.Where(g => !newGuestDict.ContainsKey(g.Name)).ToList();
//foreach (var guest in guestsToRemove)
//{
// Dictionary<string, object> gfiles = new Dictionary<string, object>()
// {
// { nameof(RB_Travel_Guest.Status),1}
// };
// List<WhereHelper> gwheres = new List<WhereHelper>()
// {
// new WhereHelper()
// {
// FiledName=nameof(RB_Travel_Guest.Id),
// FiledValue=guest.Id,
// OperatorEnum=OperatorEnum.Equal
// }
// };
// GuestRepository.Update(gfiles, gwheres);
//}
//// 处理新增和修改
//foreach (var newGuest in newGuestList)
//{
// if (dbGuestDict.TryGetValue(newGuest.Name, out var existingGuest))
// {
// var nowGuest = guestList.FirstOrDefault(x => x.Name == newGuest.Name) ?? new RB_Travel_Guest_Extend();
// Dictionary<string, object> gfiles = new Dictionary<string, object>()
// {
// { nameof(RB_Travel_Guest.Name),newGuest.Name},
// { nameof(RB_Travel_Guest.IdCard),newGuest.IdCard},
// { nameof(RB_Travel_Guest.PassportExpiry),newGuest.PassportExpiry},
// { nameof(RB_Travel_Guest.PassportIssued),newGuest.PassportIssued},
// { nameof(RB_Travel_Guest.PassportNo),newGuest.PassportNo},
// { nameof(RB_Travel_Guest.Birthday),newGuest.Birthday},
// { nameof(RB_Travel_Guest.Tel),newGuest.Tel},
// };
// List<WhereHelper> gwheres = new List<WhereHelper>()
// {
// new WhereHelper()
// {
// FiledName=nameof(RB_Travel_Guest.Id),
// FiledValue=nowGuest.Id,
// OperatorEnum=OperatorEnum.Equal
// }
// };
// GuestRepository.Update(gfiles, gwheres);
// }
// else
// {
// // 新增记录
// GuestRepository.Insert(new RB_Travel_Guest()
// {
// Id = 0,
// TCID = dmodel.TCID,
// OrderId = dmodel.OrderId,
// SurName = newGuest.SurName,
// Name = newGuest.Name,
// Sex = newGuest.Sex,
// ESurName = newGuest.ESurName,
// EName = newGuest.EName,
// Birthday = newGuest.Birthday,
// PassportNo = newGuest.PassportNo,
// Nationality = newGuest.Nationality ?? 2,//默认中国
// EconomicCapability = "[]",
// Remarks = newGuest.Remarks,
// MobilePhone = newGuest.Tel,
// Tel = newGuest.Tel,
// Status = 0,
// TravelType = 0,
// UnitType = 0,
// DutyType = 0,
// CreateBy = dmodel.CreateBy,
// UpdateBy = dmodel.UpdateBy,
// CreateDate = DateTime.Now,
// UpdateDate = DateTime.Now,
// IsAllograph = 2,
// IsBed = 1
// });
// }
//}
#endregion
#endregion
bool IsAllotHouse = false;
#region 日志
......@@ -6095,8 +6130,8 @@ namespace REBORN.Module.SellModule
Nationality = item.Nationality ?? 2,//默认中国
EconomicCapability = "[]",
Remarks = item.Remarks,
MobilePhone = item.MobilePhone,
Tel = item.MobilePhone,
MobilePhone = item.Tel,
Tel = item.Tel,
Status = 0,
TravelType = 0,
UnitType = 0,
......@@ -6106,7 +6141,10 @@ namespace REBORN.Module.SellModule
CreateDate = DateTime.Now,
UpdateDate = DateTime.Now,
IsAllograph = 2,
IsBed = 1
IsBed = 1,
IdCard = item.IdCard,
PassportExpiry = item.PassportExpiry,
PassportIssued = item.PassportIssued,
});
}
}
......@@ -22574,7 +22612,7 @@ namespace REBORN.Module.SellModule
{
return ApiResult.Success("请选择需要导入的EXCEL!");
}
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1);
var list = REBORN.Data.Guest.GuestDataHelper.ImpoertGuestData(FileName, 1)?.Distinct()?.ToList()??new List<Data.Guest.ImpoertGuest>();
if (orderId > 0)
{
var trans = GuestRepository.DbTransaction;
......@@ -22693,7 +22731,7 @@ namespace REBORN.Module.SellModule
return false;
}
}
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
var result = list?.Select(subItem => new { Tel = subItem?.MobilePhone ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), Name= subItem.Name, userName = subItem.SurName + subItem.Name, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone });
return JsonHelper.GetCamelCaseResultJson(result);
}
#endregion
REBORN.Services.DMCService/DMCFileUploadService.cs
View file @ 3f3b7e79
......@@ -768,15 +768,15 @@ namespace REBORN.Services.DMCService
//Type=1酒店 3-邮轮 8-单机票 9-签证 10-跟团游
if (OrderType== "1"|| OrderType == "3"|| OrderType == "8")//酒店
{
obj = new REBORN.Module.SellModule.CustomerOrderModule().ImpoertGuest_YL(fileUrl, Convert.ToInt32(OrderId), EmployeeId, OrderType);
obj = new REBORN.Module.SellModule.CustomerOrderModule().ImpoertGuest_YL(fileUrl, 0, EmployeeId, OrderType);
}
else if (OrderType == "9")//签证
{
obj = new REBORN.Module.DMCModule.VisaModule().ImpoertGuest_YL(fileUrl, Convert.ToInt32(OrderId), EmployeeId);
obj = new REBORN.Module.DMCModule.VisaModule().ImpoertGuest_YL(fileUrl, 0, EmployeeId);
}
else //跟团游
{
obj = sellOrderModule.ImpoertGuest_YL(fileUrl, Convert.ToInt32(OrderId), EmployeeId);
{// Convert.ToInt32(OrderId)
obj = sellOrderModule.ImpoertGuest_YL(fileUrl,0, EmployeeId);
}
}
catch (Exception ex)
......
REBORN.Services.SellService/CustomerOrderService.cs
View file @ 3f3b7e79
......@@ -1048,6 +1048,7 @@ namespace REBORN.Services.SellService
Tel = jobj.GetStringValue("Tel"),
});
}
orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<OrderGuestList>();
}
}
catch (Exception ex)
......@@ -2186,6 +2187,8 @@ namespace REBORN.Services.SellService
foreach (var jItem in guestInfoListArray)
{
JObject jobj = JObject.Parse(JsonHelper.Serialize(jItem));
string name = jobj.GetStringValue("Name");
orderGuestList.Add(new OrderGuestList
{
Birthday = jobj.GetDateTime("Birthday"),
......@@ -2197,6 +2200,7 @@ namespace REBORN.Services.SellService
Tel = jobj.GetStringValue("Tel"),
});
}
orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<OrderGuestList>();
}
}
catch (Exception ex)
......@@ -2982,10 +2986,12 @@ namespace REBORN.Services.SellService
ResultPageModel pmodel = JsonHelper.DeserializeObject<ResultPageModel>(request.msg.ToString());
RB_CRMTicket_Order_Extend demodel = JsonHelper.DeserializeObject<RB_CRMTicket_Order_Extend>(request.msg.ToString());
demodel.GroupId = userInfo.RB_Group_id;
if (demodel.IsMyOrder == 1) {
if (demodel.IsMyOrder == 1)
{
demodel.EnterID = userInfo.EmployeeId;
}
else {
else
{
demodel.OpEmpId = userInfo.EmployeeId;
if (userInfo != null && userInfo.RB_Post_Id > 0)
{
......@@ -3369,6 +3375,7 @@ namespace REBORN.Services.SellService
orderGuestList.Add(gmodel);
}
orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<OrderGuestList>();
}
}
catch (Exception ex)
......
REBORN.Services.SellService/SellOrderService.cs
View file @ 3f3b7e79
......@@ -6837,6 +6837,9 @@ namespace REBORN.Services.SellService
foreach (var jItem in guestInfoListArray)
{
JObject jobj = JObject.Parse(JsonHelper.Serialize(jItem));
string name = jobj.GetStringValue("Name");
string idCard = jobj.GetStringValue("IdCard");
orderGuestList.Add(new RB_Travel_Guest_Extend
{
Birthday = jobj.GetDateTime("Birthday"),
......@@ -6848,6 +6851,7 @@ namespace REBORN.Services.SellService
Tel = jobj.GetStringValue("Tel"),
});
}
//orderGuestList = orderGuestList?.Distinct()?.ToList() ?? new List<RB_Travel_Guest_Extend>();
}
}
catch (Exception ex)
......@@ -10960,7 +10964,7 @@ namespace REBORN.Services.SellService
LeaveStr = CacheManager.User.RbUserCache.GetEmployee(x.EnterID)?.IsLeave == 1 ? "已离职" : "",
LureEmpName = CacheManager.User.RbUserCache.GetEmployee(x.LureEmpId)?.EmName ?? "",
statsstr = x.AirConfirm == 2 ? "机票未确认" : (int)x.OrderState == 1 ? "正常" : (int)x.OrderState == 2 ? "占位" : (int)x.OrderState == 3 ? "候补" : (int)x.OrderState == 4 ? "取消" : "",
OrderTypeName = userInfo.SimpleEasy==1? (x.PriceTeamType == 1 ? "定制团" : "外丢团") :(x.IsLeaderOrder == 1 ? "领队" : x.GroupType.GetEnumName()),
OrderTypeName = userInfo.SimpleEasy == 1 ? (x.PriceTeamType == 1 ? "定制团" : "外丢团") : (x.IsLeaderOrder == 1 ? "领队" : x.GroupType.GetEnumName()),
//OrderType= CRMMergeOrderTypeEnum.Travel,
FinanceList = x.FinanceList.Where(z => z.Type == Common.Enum.User.WFTempLateClassEnum.IN).Select(y => new
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment