1

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -102,6 +102,10 @@ namespace REBORN.Module.DMCModule
         /// 单项门票订单
         /// </summary>
         private readonly RB_Customer_TicketOrderRepository customer_TicketOrderRepository = new RB_Customer_TicketOrderRepository();
+        /// <summary>
+        /// 门票明细
+        /// </summary>
+        private readonly RB_Customer_TicketOrderDetailRepository customer_TicketOrderDetailRepository = new RB_Customer_TicketOrderDetailRepository();
 
         /// <summary>
         /// 单机票
@@ -2103,6 +2107,15 @@ namespace REBORN.Module.DMCModule
             return customer_TicketOrderRepository.GetEntity(Id);
         }
 
+        public RB_Customer_TicketOrder_Extend GetTicketOrderV2(int Id)
+        {
+            return customer_TicketOrderRepository.GetList(new RB_Customer_TicketOrder_Extend() { OrderIds = Id.ToString() }).FirstOrDefault();
+        }
+
+        public List<RB_Customer_TicketOrderDetail_Extend> GetTicketOrderDetail(int orderId) {
+            return customer_TicketOrderDetailRepository.GetList(new RB_Customer_TicketOrderDetail_Extend() { OrderId = orderId });
+        }
+
         /// <summary>
         /// 获取订单信息
         /// </summary>

REBORN.Services.DMCService/TravelContractService.cs

@@ -1110,6 +1110,8 @@ namespace REBORN.Services.DMCService
                         model.TravelAgency_Name = bmodel.ContractTravelName;
                         model.TravelAgency_Address = bmodel.ContractTravelAddress;
                         model.TravelAgency_LicenseNum = bmodel.ContractLicenseNum;
+                        model.TravelAgency_DealMan = bmodel.AirportServicePerson;
+                        model.TravelAgency_Tel = bmodel.AirportServicePhone;
                     }
                 }
                 if (TCID > 0)
@@ -1236,11 +1238,11 @@ namespace REBORN.Services.DMCService
                     }
                     else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.TicketCoupons)
                     {
-                        var orderModel = travelContractModule.GetTicketOrder(OrderId);
-                        if (orderModel != null && orderModel.EnterID > 0)
-                        {
-                            model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? "";
-                        }
+                        var orderModel = travelContractModule.GetTicketOrderV2(OrderId);
+                        //if (orderModel != null && orderModel.EnterID > 0)
+                        //{
+                        //    model.TravelAgency_DealMan = CacheManager.User.RbUserCache.GetEmployee(orderModel.EnterID)?.EmName ?? "";
+                        //}
                         List<OrderGuestList> orderGuestList = new List<OrderGuestList>();
                         if (!string.IsNullOrWhiteSpace(orderModel.GuestInfo))
                         {
@@ -1261,6 +1263,18 @@ namespace REBORN.Services.DMCService
                                 });
                             }
                         }
+
+                        model.C_TotalPrice = orderModel.Money;
+                        model.OtherConventionPrice = orderModel.Money;
+                        model.OtherTNumber = model.ContractGuestList.Count();
+
+                        var orderDList = travelContractModule.GetTicketOrderDetail(OrderId);
+                        string room = "";
+                        foreach (var item in orderDList) {
+                            room += item.TicketName + $"({item.Num}人) ";
+                        }
+
+                        model.OtherConvention = $"<p>预订{orderModel.UseDate.Value.ToString("yyyy年MM月dd日")}{orderModel.CouponsName} {room} 船票共计{orderDList.Sum(x => x.Num)}张</p><p><br/></p>";
                     }
                     else if ((Common.Enum.ResourceTypeEnum)ContractType == Common.Enum.ResourceTypeEnum.SingleTicket)
                     {