1

REBORN.Common/ContractAPI/Models.cs

@@ -96,10 +96,6 @@ namespace OneTwoThreeZeroOne.EContracts {
         /// <summary>委托事项</summary>
         [JsonPropertyName("entrustment")]
         public Entrustment Entrustment { get; set; }
-
-        /// <summary>通用条款</summary>
-        [JsonPropertyName("clauses")]
-        public Clause[] Clauses { get; set; }
     }
 
     /// <summary>合同申报结果（对应接口2.1.2返回）</summary>
@@ -702,6 +698,10 @@ namespace OneTwoThreeZeroOne.EContracts {
     {
         /// <summary>预定项目及要求</summary>
         [JsonPropertyName("order")] public Order Order { get; set; }
+
+        /// <summary>通用条款</summary>
+        [JsonPropertyName("clauses")]
+        public Clause[] Clauses { get; set; }
     }
 
     /// <summary>预定项目信息</summary>

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -1333,7 +1333,9 @@ namespace REBORN.Module.DMCModule
                     TotalNumber = Tourist.Count(),
                     AdultNumber = Tourist.Where(x => x.IsChild == false).Count(),
                     ChildNumber = Tourist.Where(x => x.IsChild == true).Count(),
-                    Tourists = Tourist.ToArray()
+                    Tourists = Tourist.ToArray(),
+                    EmergencyContactName = htModel.Tourists_EmergencyLinkMan,
+                    EmergencyContactPhone = htModel.Tourists_EmergencyLinkTel
                 },
                 //旅客代表
                 Signatory = new Signatory
@@ -1410,6 +1412,7 @@ namespace REBORN.Module.DMCModule
                 #region 开始组装数据
                 req.TemplateId = "E00001";
 
+                List<Clause> clause = new List<Clause>();
                 req.Entrustment = new Entrustment()
                 {
                     Order = new Order() { }
@@ -1564,9 +1567,9 @@ namespace REBORN.Module.DMCModule
                 #region 其他服务
                 if (htModel.OtherConventionPrice > 0)
                 {
-                    req.Entrustment.Order.OtherService = new OtherService[] {
+                    req.Entrustment.Order.OtherService = new OtherService[1] {
                                     new OtherService(){
-                                         Item = htModel.OtherConvention,
+                                         Item =ReplaceParagraphTagsWithNewlines2(htModel.OtherConvention),// htModel.OtherConvention,
                                           TotalCost = htModel.OtherConventionPrice??0,
                                            TotalNumber = htModel.OtherTNumber
                                     }
@@ -1574,12 +1577,46 @@ namespace REBORN.Module.DMCModule
                 }
                 #endregion
 
-                req.TourGuides = new TourGuide[0];
+                clause.Add(new Clause()
+                {
+                    Item = "合同变更",
+                    Hint = "委托人与受托人协商一致，可以变更本合同约定的内容，但应当以书面等形式由双方确认。由此增加的费用，由变更提出方承担；由此减少的费用，旅行社应当退还委托人。"
+                });
+                clause.Add(new Clause()
+                {
+                    Item = "代订服务的责任约定",
+                    Hint = @"1、因预订人原因代订服务取消的，旅行社按预订单的取消政策收取费用后，余款退还预订人。
+2、因旅行社原因代订服务取消的，旅行社退还全部代订服务费用，并按代订服务费用总额的10 % 向预订人支付违约金。
+3、※旅行社按本合同约定受托代订或代办相关事项，仅在受托范围内承担受托人的相应责任。因第三方（如酒店、机场、航空公司、车公司、同行人等）原因导致委托人人身、财产权益受到损害的，旅行社不承担责任，但应当协助委托人与责任方争取正当权益。"
+                });
+                clause.Add(new Clause()
+                {
+                    Item = "争议解决方式",
+                    Hint = "本合同项下发生的争议，由双方协商解决，或向有管辖权的旅游行政主管部门、消费者协会等有关部门投诉；协商、投诉解决不成的，向北京市朝阳区人民法院起诉。"
+                });
+                clause.Add(new Clause()
+                {
+                    Item = "委托人及代理人声明",
+                    Hint = @"1、委托人已认真阅读本合同内容，充分了解《相关告知及提示》，确认预订信息无误，同意遵守本合同约定。
+2、由委托人的代理人签订本合同的，代理人须确保获得相应代理权限，且代理人承诺将本合同相关内容如实完整告知委托人并确保委托人受本合同约束。
+3、由于无法与委托人进行书面往来确认事项，委托人同意采用电话或手机短信方式进行确认。"
+                });
+
+                req.SupplementaryClause = "";
+                req.TourGuides = null;
+                req.Itinerary = null;
+                req.GroupAgreement = null;
+                req.Activities = null;
+                req.Shoppings = null;
+                req.Dispute = null;
+                req.Insurance = null;
+                req.Cost = null;
+                req.Entrustment.Clauses = clause.ToArray();
 
                 var payload = service.GetJson(req);
                 LogHelper.Write(payload);
 
-                var response = service.ApplyContract(payload);
+                var response = service.ApplyContract(payload, htModel.ThirdContractID);
                 LogHelper.WriteInfo(JsonHelper.Serialize(response));
                 #endregion