Skip to content

H
huatu_API
Commit 2edeb5eb authored by liudong1993's avatar liudong1993
Browse files
Options

1

parent f75e6ce6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 266 additions and 266 deletions
REBORN.Module.SellModule/SellOrderModule.cs
View file @ 2edeb5eb
This diff is collapsed.
REBORN.Repository/Dmc/RB_Travel_GuestRepository.cs
View file @ 2edeb5eb
......@@ -214,7 +214,7 @@ namespace REBORN.Repository.Dmc
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT g.Status,g.SurName,g.`Name`,g.Tel,g.PassportNo,g.IdCard,g.PassportExpiry,g.PassportIssued,g.OrderId,g.TCID,g.Id,g.passportNo,g.mobilePhone,g.Sex,g.Birthday,g.ApplyStatus,g.VisaManageStatus,g.IsBed,g.VisaType,IFNULL(g.TicketOutType,0) AS TicketOutType
SELECT g.Status,g.SurName,g.`Name`,g.Tel,g.PassportNo,g.IdCard,g.PassportExpiry,g.PassportIssued,g.OrderId,g.TCID,g.Id,g.passportNo,g.mobilePhone,g.Sex,g.Birthday,g.ApplyStatus,g.VisaManageStatus,g.IsBed,g.VisaType,IFNULL(g.TicketOutType,0) AS TicketOutType,g.Remarks
FROM RB_Travel_Guest g
WHERE 1=1
");
......
REBORN.Services.DMCService/VisaService.cs
View file @ 2edeb5eb
......@@ -3909,7 +3909,7 @@ namespace REBORN.Services.DMCService
}),
ZaiTu = x.PlatformMoney,
DueInMoney = ((x.TotalPrice ?? 0) - (x.Income ?? 0) + (x.RefundMoney ?? 0) - (x.PlatformTax ?? 0) - (x.DiscountMoney ?? 0) - (x.PlatformMoney)).ToString("#0.00"),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, subItem?.Remarks, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
VisaPlanIdStr = string.Join(",", x.GuestList.Where(y => (y.VisaPlanId ?? 0) > 0).Select(y => (y.VisaPlanId ?? 0)).Distinct().ToList()),
x.IsFinish,
FinishTime = x.FinishTime.HasValue ? x.FinishTime.Value.ToString("yyyy-MM-dd") : "",
......@@ -5541,7 +5541,7 @@ namespace REBORN.Services.DMCService
y.ApplyMoney,
y.InvoiceApplyState
}),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, subItem?.Remarks, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
x.FinalPriceTips,
x.Meet,
x.OtherContractList,
......@@ -5680,7 +5680,7 @@ namespace REBORN.Services.DMCService
x.ExpressFeeNum,
x.ServiceFeeNum,
x.IsChargeLossOrders,
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, subItem?.Remarks, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
x.FinalPriceTips,
x.Meet,
x.OtherContractList,
......
REBORN.Services.SellService/SellOrderService.cs
View file @ 2edeb5eb
......@@ -11725,7 +11725,7 @@ namespace REBORN.Services.SellService
y.ApplyMoney,
y.InvoiceApplyState
}),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
GuestList = x.GuestList.Select(subItem => new { GuestId = subItem.Id, subItem?.Remarks, Tel = subItem?.Tel ?? "", IdCard = subItem?.IdCard ?? "", PassportNo = subItem?.PassportNo ?? "", PassportExpiry = StringHelper.FormatDate(subItem.PassportExpiry), PassportIssued = StringHelper.FormatDate(subItem.PassportIssued), Birthday = StringHelper.FormatDate(subItem.Birthday), subItem.IsApplyPhoto, subItem.OrderId, 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, subItem.VisaType, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
IsShowDisclaimer = (x?.GuestList?.Where(z => z.DisclaimerId > 0).Count() == x?.GuestList?.Count()) ? 0 : 1,
CancelGuestList = x.CancelGuestList.Select(subItem => new { GuestId = subItem.Id, subItem.IsApplyPhoto, subItem.OrderId, userName = subItem.SurName + subItem.Name, subItem.PassportNo, SexStr = subItem.Sex == 1 ? "男" : subItem.Sex == 2 ? "女" : "保密", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone, subItem.TicketOutType, subItem.TicketOutTypeStr, subItem.ProtocolId, subItem.DisclaimerId }),
PhotoNum = x.PhotoNum ?? 0,
......
REBORN.Services.SellService/SellOrderService_V3.cs
View file @ 2edeb5eb
......@@ -5030,20 +5030,20 @@ namespace REBORN.Services.SellService
{
return ApiResult.ParamIsNull("团信息不存在,请核实后再试");
}
if (TravelModel.StartDate <= DateTime.Now)
{
return ApiResult.ParamIsNull("团已出发,不能取消订单");
}
int oldGuestNum = sellOrderModule.GetTravelOrderGuestNumModule((orderModel?.TCID ?? 0));
//if (TravelModel.StartDate <= DateTime.Now)
//{
// return ApiResult.ParamIsNull("团已出发,不能取消订单");
//}
//int oldGuestNum = sellOrderModule.GetTravelOrderGuestNumModule((orderModel?.TCID ?? 0));//画途 暂时不要
bool flag = sellOrderModule.RemoveOrder(ID, userInfo);
if (flag)
{
// SendSignalr(0, TravelModel.StartDate);
int newGuestNum = sellOrderModule.GetTravelOrderGuestNumModule((orderModel?.TCID ?? 0));
if (oldGuestNum != newGuestNum)
{
sellOrderModule.PushOrderNumChangeMessageModule((orderModel?.TCID ?? 0), oldGuestNum, newGuestNum);
}
//int newGuestNum = sellOrderModule.GetTravelOrderGuestNumModule((orderModel?.TCID ?? 0));//画途 暂时不要
//if (oldGuestNum != newGuestNum)
//{
// sellOrderModule.PushOrderNumChangeMessageModule((orderModel?.TCID ?? 0), oldGuestNum, newGuestNum);
//}
return ApiResult.Success();
}
else
......
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