Skip to content

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

1

parent 14d652ca
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 17 deletions
REBORN.Services.DMCService/TravelContractService.cs
View file @ cb57870a
...@@ -630,6 +630,8 @@ namespace REBORN.Services.DMCService ...@@ -630,6 +630,8 @@ namespace REBORN.Services.DMCService
model.Company = bmodel.ContractTravelName; model.Company = bmodel.ContractTravelName;
model.Company_Address = bmodel.ContractTravelAddress; model.Company_Address = bmodel.ContractTravelAddress;
model.Business_Certificate = bmodel.ContractLicenseNum; model.Business_Certificate = bmodel.ContractLicenseNum;
model.Agent_Name = bmodel.AirportServicePerson;
model.Agent_Call = bmodel.AirportServicePhone;
} }
} }
} }
...@@ -1160,11 +1162,11 @@ namespace REBORN.Services.DMCService ...@@ -1160,11 +1162,11 @@ namespace REBORN.Services.DMCService
model.ContractGuestList = new List<ContractGuest>(); model.ContractGuestList = new List<ContractGuest>();
if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.TeamPrice) if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.TeamPrice)
{ {
var orderModel = travelContractModule.GetTravelOrder(OrderId); //var orderModel = travelContractModule.GetTravelOrder(OrderId);
if (orderModel != null && orderModel.EnterID > 0) //if (orderModel != null && orderModel.EnterID > 0)
{ //{
model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? ""; // model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? "";
} //}
var guestList = travelContractModule.GetTravelGuestList(new RB_Travel_Guest_Extend() { IsAllograph = 2, OrderId = OrderId }); var guestList = travelContractModule.GetTravelGuestList(new RB_Travel_Guest_Extend() { IsAllograph = 2, OrderId = OrderId });
if (guestList != null && guestList.Count > 0) if (guestList != null && guestList.Count > 0)
{ {
...@@ -1186,10 +1188,10 @@ namespace REBORN.Services.DMCService ...@@ -1186,10 +1188,10 @@ namespace REBORN.Services.DMCService
else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.Visa) else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.Visa)
{ {
var orderModel = travelContractModule.GetVisaOrder(OrderId); var orderModel = travelContractModule.GetVisaOrder(OrderId);
if (orderModel != null && orderModel.CreateBy > 0) //if (orderModel != null && orderModel.CreateBy > 0)
{ //{
model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.CreateBy)?.EmName ?? ""; // model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.CreateBy)?.EmName ?? "";
} //}
var guestList = travelContractModule.GetTravelGuestList(new RB_Travel_Guest_Extend() { IsAllograph = 1, OrderId = OrderId }); var guestList = travelContractModule.GetTravelGuestList(new RB_Travel_Guest_Extend() { IsAllograph = 1, OrderId = OrderId });
if (guestList != null && guestList.Count > 0) if (guestList != null && guestList.Count > 0)
{ {
...@@ -1207,14 +1209,17 @@ namespace REBORN.Services.DMCService ...@@ -1207,14 +1209,17 @@ namespace REBORN.Services.DMCService
}); });
} }
} }
model.C_TotalPrice = orderModel.TotalPrice??0;
model.VisaTotalPrice = orderModel.TotalPrice??0;
model.VisaTNumber = model.ContractGuestList.Count();
} }
else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.Hotel) else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.Hotel)
{ {
var orderModel = travelContractModule.GetHotelOrder(OrderId); var orderModel = travelContractModule.GetHotelOrder(OrderId);
if (orderModel != null && orderModel.EnterID > 0) //if (orderModel != null && orderModel.EnterID > 0)
{ //{
model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? ""; // model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? "";
} //}
List<OrderGuestList> orderGuestList = new List<OrderGuestList>(); List<OrderGuestList> orderGuestList = new List<OrderGuestList>();
if (!string.IsNullOrWhiteSpace(orderModel.GuestInfo)) if (!string.IsNullOrWhiteSpace(orderModel.GuestInfo))
{ {
...@@ -1235,6 +1240,9 @@ namespace REBORN.Services.DMCService ...@@ -1235,6 +1240,9 @@ namespace REBORN.Services.DMCService
}); });
} }
} }
model.C_TotalPrice = orderModel.Money;
model.HotelTotalPrice = orderModel.Money;
} }
else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.TicketCoupons) else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.TicketCoupons)
{ {
...@@ -1279,10 +1287,10 @@ namespace REBORN.Services.DMCService ...@@ -1279,10 +1287,10 @@ namespace REBORN.Services.DMCService
else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.SingleTicket) else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.SingleTicket)
{ {
var orderModel = travelContractModule.GetcRMTicketOrder(OrderId); var orderModel = travelContractModule.GetcRMTicketOrder(OrderId);
if (orderModel != null && orderModel.EnterID > 0) //if (orderModel != null && orderModel.EnterID > 0)
{ //{
model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? ""; // model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? "";
} //}
List<OrderGuestList> orderGuestList = new List<OrderGuestList>(); List<OrderGuestList> orderGuestList = new List<OrderGuestList>();
if (!string.IsNullOrWhiteSpace(orderModel.GuestInfo)) if (!string.IsNullOrWhiteSpace(orderModel.GuestInfo))
{ {
...@@ -1303,6 +1311,10 @@ namespace REBORN.Services.DMCService ...@@ -1303,6 +1311,10 @@ namespace REBORN.Services.DMCService
}); });
} }
} }
model.C_TotalPrice = orderModel.Money;
model.TicketTotalDepositPrice = orderModel.Money;
model.TicketTotalNum = model.ContractGuestList.Count();
} }
} }
} }
......
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