邮轮新增天数

REBORN.Model/Entity/Dmc/RB_Customer_TicketOrder.cs

@@ -82,6 +82,11 @@ namespace REBORN.Model.Entity.Dmc
         /// </summary>
         public DateTime? UseDate { get; set; }
 
+        /// <summary>
+        /// 行程天数
+        /// </summary>
+        public int UseDay { get; set; }
+
         /// <summary>
         /// 实收
         /// </summary>

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -3500,6 +3500,11 @@ namespace REBORN.Module.SellModule
                     {
                         logContent += $"尾款提醒天数由【{oldOrderModel.FinalPriceTips}】修改为【{demodel.FinalPriceTips}】，";
                     }
+                    if (demodel.UseDay != oldOrderModel.UseDay)
+                    {
+                        logContent += $"行程天数由【{oldOrderModel.UseDay}】修改为【{demodel.UseDay}】，";
+                    }
+                    
                     #endregion
 
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {
@@ -3522,6 +3527,7 @@ namespace REBORN.Module.SellModule
                     { 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.UseDay), demodel.UseDay},
                     { nameof(RB_Customer_TicketOrder_Extend.GuestInfo), demodel.GuestInfo},
                 };
                     List<WhereHelper> wheres = new List<WhereHelper>() {

REBORN.Repository/Dmc/RB_Travel_GuestRepository.cs

@@ -1331,7 +1331,7 @@ where g.Status=0 and b.OrderStatus=2   {where} ORDER BY b.OrderDate desc ";
             }
             else if (dmodel.IsAllograph == 4)//邮轮
             {
-                sql = $@"SELECT g.*,b.UseDate as TCStartDate,0 as StayDay,b.GroupId,b.EnterID from rb_travel_guest  as g LEFT JOIN rb_customer_ticketorder as b on g.OrderId=b.OrderId 
+                sql = $@"SELECT g.*,b.UseDate as TCStartDate,b.UseDay as StayDay,b.GroupId,b.EnterID from rb_travel_guest  as g LEFT JOIN rb_customer_ticketorder as b on g.OrderId=b.OrderId 
 where g.Status=0 and b.OrderStatus=2   {where} ORDER BY b.UseDate desc ";
             }
             else if (dmodel.IsAllograph == 5)//单机票

REBORN.Services.SellService/CustomerOrderService.cs

@@ -1693,6 +1693,7 @@ namespace REBORN.Services.SellService
                 x.Meet,
                 x.FinalPriceTips,
                 x.OtherContractList,
+                x.UseDay,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
                 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) }),
@@ -2243,6 +2244,7 @@ namespace REBORN.Services.SellService
                     Birthday = parms.GetDateTime("Birthday"),
                     Meet = parms.GetDecimal("Meet"),
                     PeopleNum = parms.GetInt("PeopleNum", 0),//人数
+                    UseDay = parms.GetInt("UseDay", 0),//行程天数
                     EmpBranchId = userInfo.RB_Branch_id,
                     UpdateBy = userInfo.EmployeeId,
                     UpdateTime = now,
@@ -2633,6 +2635,7 @@ namespace REBORN.Services.SellService
                 x.FinalPriceTips,
                 x.OtherContractList,
                 ContractType = Common.Enum.ResourceTypeEnum.TicketCoupons,
+                x.UseDay,
                 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 ?? "" },