Commit 58e0b429 authored by 吴春's avatar 吴春

1

parent dcb75763
...@@ -5060,7 +5060,7 @@ namespace REBORN.Services.DMCService ...@@ -5060,7 +5060,7 @@ namespace REBORN.Services.DMCService
Common.Plugin.LogHelper.Write(ex, "SetTeavelTeam"); Common.Plugin.LogHelper.Write(ex, "SetTeavelTeam");
} }
} }
if (orderGuestList!=null&& orderGuestList.Any()) if (orderGuestList != null && orderGuestList.Any())
{ {
model.GuestInfo = JsonConvert.SerializeObject(orderGuestList); model.GuestInfo = JsonConvert.SerializeObject(orderGuestList);
// return ApiResult.ParamIsNull("请填写入住人员名单"); // return ApiResult.ParamIsNull("请填写入住人员名单");
...@@ -5073,7 +5073,7 @@ namespace REBORN.Services.DMCService ...@@ -5073,7 +5073,7 @@ namespace REBORN.Services.DMCService
Contact = parm.GetStringValue("Contact"), Contact = parm.GetStringValue("Contact"),
Name = parm.GetStringValue("SupplierName"), Name = parm.GetStringValue("SupplierName"),
Status = Common.Enum.DateStateEnum.Normal, Status = Common.Enum.DateStateEnum.Normal,
// Type = Common.Enum.ResourceTypeEnum.Visa, // Type = Common.Enum.ResourceTypeEnum.Visa,
CompanyName = parm.GetStringValue("CompanyName"),//公司名称 CompanyName = parm.GetStringValue("CompanyName"),//公司名称
DutyParagraph = parm.GetStringValue("DutyParagraph"),//营业执照号 DutyParagraph = parm.GetStringValue("DutyParagraph"),//营业执照号
CompanyPhone = parm.GetStringValue("CompanyPhone"),//电话 CompanyPhone = parm.GetStringValue("CompanyPhone"),//电话
...@@ -5483,6 +5483,7 @@ namespace REBORN.Services.DMCService ...@@ -5483,6 +5483,7 @@ namespace REBORN.Services.DMCService
CreateTime = x.CreateTime.HasValue ? x.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", CreateTime = x.CreateTime.HasValue ? x.CreateTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
LureEmpName = CacheManager.User.RbUserCache.GetEmployee(x.LureEmpId)?.EmName ?? "", LureEmpName = CacheManager.User.RbUserCache.GetEmployee(x.LureEmpId)?.EmName ?? "",
OpEmName = CacheManager.User.RbUserCache.GetEmployee(x.OpEmpId)?.EmName ?? "", OpEmName = CacheManager.User.RbUserCache.GetEmployee(x.OpEmpId)?.EmName ?? "",
CreateBy = x.CreateBy ?? 0,
VisaStatus = Convert.ToDateTime(x.SendStartDate) >= Convert.ToDateTime(System.DateTime.Now.ToString("yyyy-MM-dd")) ? 1 : 2, VisaStatus = Convert.ToDateTime(x.SendStartDate) >= Convert.ToDateTime(System.DateTime.Now.ToString("yyyy-MM-dd")) ? 1 : 2,
Commission = x.PeopleNum * x.CommissionMoney, Commission = x.PeopleNum * x.CommissionMoney,
DepartDate = x.EnterCountryTime.HasValue ? x.EnterCountryTime.Value.ToString("yyyy-MM-dd") : "", DepartDate = x.EnterCountryTime.HasValue ? x.EnterCountryTime.Value.ToString("yyyy-MM-dd") : "",
......
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