邮轮加了一个出发地

REBORN.Model/Entity/Dmc/RB_Customer_TicketOrder.cs

@@ -283,6 +283,11 @@ namespace REBORN.Model.Entity.Dmc
         /// 旅客信息
         /// </summary>
         public string GuestInfo { get; set; }
+
+        /// <summary>
+        /// 出发地
+        /// </summary>
+        public int PlacplaceDeparture { get; set; }
         #endregion
 
     }

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -3607,6 +3607,10 @@ namespace REBORN.Module.SellModule
                     {
                         logContent += $"销售由【{oldOrderModel.EnterID}】修改为【{demodel.EnterID}】，";
                     }
+                    if (demodel.PlacplaceDeparture != oldOrderModel.PlacplaceDeparture)
+                    {
+                        logContent += $"出发地由【{oldOrderModel.PlacplaceDeparture}】修改为【{demodel.PlacplaceDeparture}】，";
+                    }
                     #endregion
 
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {
@@ -3632,6 +3636,7 @@ namespace REBORN.Module.SellModule
                     { nameof(RB_Customer_TicketOrder_Extend.UseDay), demodel.UseDay},
                     { nameof(RB_Customer_TicketOrder_Extend.GuestInfo), demodel.GuestInfo},
                     { nameof(RB_Customer_TicketOrder_Extend.EnterID), demodel.EnterID},
+                    { nameof(RB_Customer_TicketOrder_Extend.PlacplaceDeparture), demodel.PlacplaceDeparture},
                     { nameof(RB_Customer_TicketOrder_Extend.EmpBranchId), demodel.EmpBranchId},
                 };
                     List<WhereHelper> wheres = new List<WhereHelper>() {

REBORN.Services.SellService/CustomerOrderService.cs

@@ -1703,6 +1703,8 @@ namespace REBORN.Services.SellService
                 x.OtherContractList,
                 x.UseDay,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
+                x.PlacplaceDeparture,
+                PlacplaceDepartureStr = x.PlacplaceDeparture == 1 ? "国内" : (x.PlacplaceDeparture == 2 ? "国外" : ""),
                 OrderGuestList = x.OrderGuestList.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.OrderId, Name = subItem?.Name ?? "", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                 // OrderGuestList = x.OrderGuestList?.Select(z => new { PassportIssued = StringHelper.FormatDate(z?.PassportIssued), PassportExpiry = StringHelper.FormatDate(z?.PassportExpiry), IdCard = z?.IdCard ?? "", Name = z?.Name ?? "", Tel = z?.Tel ?? "", PassportNo = z?.PassportNo ?? "", Birthday = StringHelper.FormatDate(z.Birthday) }),
                 SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },
@@ -2272,6 +2274,7 @@ namespace REBORN.Services.SellService
                     OrderStatus = CustomerOrderStatusEnum.Confirm,
                     CurrencyId = 1,
                     OrderId = parms.GetInt("OrderId"),
+                    PlacplaceDeparture = parms.GetInt("PlacplaceDeparture", 0),
                 };
                 //出行人员名单（姓名、电话、出生年月日是必须的、护照号、身份证号、护照有效期非必填）
                 string guestInfoStr = parms.GetStringValue("GuestList");
@@ -2686,6 +2689,8 @@ namespace REBORN.Services.SellService
                 x.OtherContractList,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
                 x.UseDay,
+                x.PlacplaceDeparture,
+                PlacplaceDepartureStr = x.PlacplaceDeparture == 1 ? "国内" : (x.PlacplaceDeparture == 2 ? "国外" : ""),
                 OrderGuestList = x.OrderGuestList.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.OrderId, Name = subItem?.Name ?? "", Age = subItem.Birthday.HasValue ? System.DateTime.Now.Year - subItem.Birthday.Value.Year : 0, subItem.MobilePhone }),
                 // OrderGuestList = x.OrderGuestList?.Select(z => new { PassportIssued = StringHelper.FormatDate(z?.PassportIssued), PassportExpiry = StringHelper.FormatDate(z?.PassportExpiry), IdCard = z?.IdCard ?? "", Name = z?.Name ?? "", Tel = z?.Tel ?? "", PassportNo = z?.PassportNo ?? "", Birthday = StringHelper.FormatDate(z.Birthday) }),
                 SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },