1

REBORN.Common/ContractAPI/Models.cs

@@ -710,15 +710,15 @@ namespace OneTwoThreeZeroOne.EContracts {
         /// <summary>机票预定相关</summary>
         [JsonPropertyName("airTickets")] public AirTicket[] AirTickets { get; set; }
         /// <summary>酒店预定代办</summary>
-        [JsonPropertyName("accommodation")] public Accommodation[] Accommodation { get; set; }
+        [JsonPropertyName("accommodation")] public Accommodation Accommodation { get; set; }
         /// <summary>用车代办</summary>
-        [JsonPropertyName("transportService")] public TransportService[] TransportService { get; set; }
+        [JsonPropertyName("transportService")] public TransportService TransportService { get; set; }
         /// <summary>导游服务代办</summary>
-        [JsonPropertyName("tourGuideService")] public TourGuideService[] TourGuideService { get; set; }
+        [JsonPropertyName("tourGuideService")] public TourGuideService TourGuideService { get; set; }
         /// <summary>签证代办</summary>
-        [JsonPropertyName("visaService")] public VisaService[] VisaService { get; set; }
+        [JsonPropertyName("visaService")] public VisaService VisaService { get; set; }
         /// <summary>其他服务</summary>
-        [JsonPropertyName("otherService")] public OtherService[] OtherService { get; set; }
+        [JsonPropertyName("otherService")] public OtherService OtherService { get; set; }
     }
 
     /// <summary>机票预定信息</summary>

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -1476,13 +1476,13 @@ namespace REBORN.Module.DMCModule
                         });
                     }
 
-                    req.Entrustment.Order.Accommodation = new Accommodation[] {
-                                    new Accommodation(){
-                                         Accommodations = Accommodations.ToArray(),
-                                          TotalPrice = htModel.HotelTotalPrice,
-                                          Memo= htModel.HotelDescription
-                                    }
-                                };
+                    req.Entrustment.Order.Accommodation =new Accommodation()
+                                    {
+                                        Accommodations = Accommodations.ToArray(),
+                                        TotalPrice = htModel.HotelTotalPrice,
+                                        Memo = htModel.HotelDescription
+
+                                    };
                 }
                 #endregion
 
@@ -1510,14 +1510,14 @@ namespace REBORN.Module.DMCModule
                         });
                     }
 
-                    req.Entrustment.Order.TransportService = new TransportService[] {
-                                    new TransportService(){
-                                         TransportServices = TransportServices.ToArray(),
-                                          TotalCost = htModel.PickUpTotalPrice,
-                                           Memo = htModel.PickUpDescription,
-                                            TotalNumber = htModel.PickUpTNumber
-                                    }
-                                };
+                    req.Entrustment.Order.TransportService =new TransportService()
+                                    {
+                                        TransportServices = TransportServices.ToArray(),
+                                        TotalCost = htModel.PickUpTotalPrice,
+                                        Memo = htModel.PickUpDescription,
+                                        TotalNumber = htModel.PickUpTNumber
+
+                                    };
                 }
                 #endregion
 
@@ -1544,36 +1544,28 @@ namespace REBORN.Module.DMCModule
                         });
                     }
 
-                    req.Entrustment.Order.VisaService = new VisaService[] {
-                                    new VisaService(){
-                                         VisaServices = VisaServices.ToArray(),
-                                          TotalCost = htModel.VisaTotalPrice,
-                                           Memo = htModel.VisaDescription,
-                                            TotalNumber = htModel.VisaTNumber,
-                                             VisaDeadline = htModel.VisaDeadline
-                                    }
-                                };
-                }
-
-                #endregion
+                    req.Entrustment.Order.VisaService =new VisaService()
+                                    {
+                                        VisaServices = VisaServices.ToArray(),
+                                        TotalCost = htModel.VisaTotalPrice,
+                                        Memo = htModel.VisaDescription,
+                                        TotalNumber = htModel.VisaTNumber,
+                                        VisaDeadline = htModel.VisaDeadline
 
-                #region 机+酒
-                if (htModel.TicketAndHotelTotalPrice > 0)
-                {
-                    //暂时不用了   一年多都没合同
+                                    };
                 }
+
                 #endregion
 
                 #region 其他服务
                 if (htModel.OtherConventionPrice > 0)
                 {
-                    req.Entrustment.Order.OtherService = new OtherService[1] {
-                                    new OtherService(){
-                                         Item =ReplaceParagraphTagsWithNewlines2(htModel.OtherConvention),// htModel.OtherConvention,
-                                          TotalCost = htModel.OtherConventionPrice??0,
-                                           TotalNumber = htModel.OtherTNumber
-                                    }
-                                };
+                    req.Entrustment.Order.OtherService = new OtherService
+                    {
+                        Item = ReplaceParagraphTagsWithNewlines2(htModel.OtherConvention),// htModel.OtherConvention,
+                        TotalCost = htModel.OtherConventionPrice ?? 0,
+                        TotalNumber = htModel.OtherTNumber
+                    };
                 }
                 #endregion