1

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -796,8 +796,8 @@ namespace REBORN.Module.DMCModule
                 string contractType = data.GetStringValue("contractType");//  暂时没有 补充协议一说
                 string contractNumber = data.GetStringValue("contractNumber");
                 //string sign = data.GetStringValue("sign");//暂时不验证签名
-                JObject url = JObject.Parse(data.GetStringValue("url"));
-                string fileURL = url.GetStringValue("fileURL");
+                //JObject url = JObject.Parse(data.GetStringValue("url"));
+                //string fileURL = url.GetStringValue("fileURL");
 
                 //根据合同编号 查询合同
                 var model = contractRepository.GetEntityExtRepository(new RB_Contract_Extend() { ThirdContractID = contractNumber }).FirstOrDefault();
@@ -805,7 +805,7 @@ namespace REBORN.Module.DMCModule
                 {
                     Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                         { nameof(RB_Contract_Extend.ThirdContractState), state},
-                        { nameof(RB_Contract_Extend.ThirdContractFileUrl), fileURL},
+                        //{ nameof(RB_Contract_Extend.ThirdContractFileUrl), fileURL},
                     };
                     if (state == 2)
                     {
@@ -827,7 +827,7 @@ namespace REBORN.Module.DMCModule
                     {
                         Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                             { nameof(RB_Travel_Contract_Extend.ThirdContractState), state},
-                            { nameof(RB_Travel_Contract_Extend.ThirdContractFileUrl), fileURL},
+                            //{ nameof(RB_Travel_Contract_Extend.ThirdContractFileUrl), fileURL},
                         };
                         if (state == 2)
                         {
@@ -1607,11 +1607,24 @@ namespace REBORN.Module.DMCModule
 
                 foreach (var item in termsList.Where(x => x.SNO == 5))
                 {
-                    clause.Add(new Clause()
+                    if (item.Name == "代订服务的责任约定" && htModel.OtherConventionPrice > 0 && htModel.RB_Group_Id == 106)
                     {
-                        Item = item.Name,
-                        Hint = item.Content
-                    });
+                        //邮轮的 就使用 6
+                        var tmodel = termsList.Where(x => x.SNO == 6).FirstOrDefault();
+                        clause.Add(new Clause()
+                        {
+                            Item = tmodel.Name,
+                            Hint = tmodel.Content
+                        });
+                    }
+                    else
+                    {
+                        clause.Add(new Clause()
+                        {
+                            Item = item.Name,
+                            Hint = item.Content
+                        });
+                    }
                 }
 
                 req.SupplementaryClause = "";