1

REBORN.Model/Entity/Dmc/RB_Contract.cs

@@ -1045,5 +1045,10 @@ namespace REBORN.Model.Entity.Dmc
         /// 费用支付说明
         /// </summary>
         public string PriceDescription { get; set; }
+
+        /// <summary>
+        /// 合团附件  最多3个，只支持 PDF docx
+        /// </summary>
+        public string FileUrl { get; set; }
     }
 }

REBORN.Model/Entity/Dmc/RB_Travel_Contract.cs

@@ -1136,5 +1136,10 @@ namespace REBORN.Model.Entity.Dmc
         /// 合同模板 0系统合同   1旅游局合同
         /// </summary>
         public int ContractTemplete { get; set; }
+
+        /// <summary>
+        /// 合团附件  最多3个，只支持 PDF docx
+        /// </summary>
+        public string FileUrl { get; set; }
     }
 }

REBORN.Model/Extend/Dmc/RB_Contract_Extend.cs

@@ -33,6 +33,11 @@ namespace REBORN.Model.Extend.Dmc
         /// 是否上传旅游局合同  1是
         /// </summary>
         public int IsApplyContract { get; set; }
+
+        /// <summary>
+        /// 合团附件
+        /// </summary>
+        public List<ContractFile> FileList { get; set; }
     }
 
     /// <summary>
@@ -75,4 +80,19 @@ namespace REBORN.Model.Extend.Dmc
         /// </summary>
         public string Mobile { get; set; }
     }
+
+    /// <summary>
+    /// 合同附件
+    /// </summary>
+    public class ContractFile { 
+        /// <summary>
+        /// 路径
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name { get; set; }
+    }
 }

REBORN.Model/Extend/Dmc/RB_Travel_Contract_Extend.cs

@@ -171,6 +171,11 @@ namespace REBORN.Model.Extend.Dmc
         /// </summary>
         public int IsApplyContract { get; set; }
 
+        /// <summary>
+        /// 合同列表
+        /// </summary>
+        public List<ContractFile> FileList { get; set; }
+
     }
 
     /// <summary>

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -321,6 +321,7 @@ namespace REBORN.Module.DMCModule
                     {nameof(RB_Contract_Extend.DepositDate),model.DepositDate },
                     {nameof(RB_Contract_Extend.FinalPrice),model.FinalPrice },
                     {nameof(RB_Contract_Extend.PriceDescription),model.PriceDescription },
+                    {nameof(RB_Contract_Extend.FileUrl),model.FileUrl },
                     {nameof(RB_Contract_Extend.UpdateTime),DateTime.Now },
                 };
                 flag = contractRepository.Update(fileds, new WhereHelper(nameof(RB_Contract_Extend.Id), model.Id));
@@ -580,7 +581,21 @@ namespace REBORN.Module.DMCModule
                     MergeToCompanyName = htModel.Carpool_Company
                 }
             };
+            if (!string.IsNullOrEmpty(htModel.FileUrl)) {
+                var fileList = JsonHelper.DeserializeObject<List<ContractFile>>(htModel.FileUrl);
+                if (fileList.Any()) {
+                    var Attachments = new List<Attachment>();
+                    foreach (var item in fileList) {
+                        Attachments.Add(new Attachment()
+                        {
+                            Url = item.Url,
+                            Type = System.IO.Path.GetExtension(item.Url)
+                        });
+                    }
 
+                    req.Attachments = Attachments.ToArray();
+                }
+            }
 
             var payload = service.GetJson(req);
             LogHelper.Write(payload);
@@ -1036,6 +1051,7 @@ namespace REBORN.Module.DMCModule
                     {nameof(RB_Travel_Contract_Extend.Tourists_Sex),extModel.Tourists_Sex },
                     {nameof(RB_Travel_Contract_Extend.Tourists_Unit),extModel.Tourists_Unit },
                     {nameof(RB_Travel_Contract_Extend.Tourists_IDType),extModel.Tourists_IDType },
+                    {nameof(RB_Travel_Contract_Extend.FileUrl),extModel.FileUrl },
                 };
                 flag = travel_ContractRepository.Update(fileds, new WhereHelper(nameof(RB_Travel_Contract_Extend.ID), extModel.ID));
                 if (flag) {
@@ -1631,6 +1647,22 @@ namespace REBORN.Module.DMCModule
                 }
                 #endregion
 
+                #region 合同附件
+                if (htModel.FileList != null && htModel.FileList.Any())
+                {
+                    var Attachments = new List<Attachment>();
+                    foreach (var item in htModel.FileList)
+                    {
+                        Attachments.Add(new Attachment()
+                        {
+                            Url = item.Url,
+                            Type = System.IO.Path.GetExtension(item.Url)
+                        });
+                    }
+                    req.Attachments = Attachments.ToArray();
+                }
+                #endregion
+
                 foreach (var item in termsList.Where(x => x.SNO == 5))
                 {
                     if (item.Name == "代订服务的责任约定" && htModel.OtherConventionPrice > 0 && htModel.RB_Group_Id == 106)

REBORN.Services.DMCService/TravelContractService.cs

@@ -395,6 +395,29 @@ namespace REBORN.Services.DMCService
                     }
                 }
             }
+            string fileList = parm.GetStringValue("fileList");
+            model.FileList = new List<ContractFile>();
+            if (!string.IsNullOrWhiteSpace(fileList))
+            {
+                JArray fileArr = JArray.Parse(fileList);
+                if (fileArr != null && fileArr.Count > 0)
+                {
+                    if (fileArr.Count > 3) { return ApiResult.Failed("附件最多上传3个"); }
+                    foreach (var jItem in fileArr)
+                    {
+                        JObject jobj = JObject.Parse(JsonHelper.Serialize(jItem));
+                        model.FileList.Add(new ContractFile
+                        {
+                            Url = jobj.GetStringValue("Url"),
+                            Name = jobj.GetStringValue("Name"),
+                        });
+                    }
+                    if (model.FileList != null && model.FileList.Any())
+                    {
+                        model.FileUrl = JsonConvert.SerializeObject(model.FileList);
+                    }
+                }
+            }
             if (model.Id == 0)//查询旅客信息
             {
                 model.CreateBy = userInfo.EmployeeId;
@@ -1006,7 +1029,8 @@ namespace REBORN.Services.DMCService
                 thirdContractSignUrl = model?.ThirdContractSignUrl,
                 thirdContractQRCode = model?.ThirdContractQRCode,
                 thirdContractFileUrl = model?.ThirdContractFileUrl,
-                contractTemplete = model?.ContractTemplete
+                contractTemplete = model?.ContractTemplete,
+                fileList = !string.IsNullOrEmpty(model?.FileUrl) ? JsonHelper.DeserializeObject<List<ContractFile>>(model?.FileUrl) : new List<ContractFile>()
             };
             return ApiResult.Success(data: result);
         }
@@ -1322,6 +1346,10 @@ namespace REBORN.Services.DMCService
                     }
                 }
             }
+            model.FileList = new List<ContractFile>();
+            if (!string.IsNullOrEmpty(model.FileUrl)) {
+                model.FileList = JsonHelper.DeserializeObject<List<ContractFile>>(model.FileUrl);
+            }
             return ApiResult.Success("请求成功！", model);
         }
 
@@ -1771,6 +1799,31 @@ namespace REBORN.Services.DMCService
             {
                 extModel.TicketAndHotelJson = Common.Plugin.JsonHelper.Serialize(extModel.ContractTicketAndHotel);
             }
+
+            string fileList = parm.GetStringValue("FileList");
+            extModel.FileList = new List<ContractFile>();
+            if (!string.IsNullOrWhiteSpace(fileList))
+            {
+                JArray fileArr = JArray.Parse(fileList);
+                if (fileArr != null && fileArr.Count > 0)
+                {
+                    if (fileArr.Count > 3) { return ApiResult.Failed("附件最多上传3个"); }
+                    foreach (var jItem in fileArr)
+                    {
+                        JObject jobj = JObject.Parse(JsonHelper.Serialize(jItem));
+                        extModel.FileList.Add(new ContractFile
+                        {
+                            Url = jobj.GetStringValue("Url"),
+                            Name = jobj.GetStringValue("Name"),
+                        });
+                    }
+                    if (extModel.FileList != null && extModel.FileList.Any())
+                    {
+                        extModel.FileUrl = JsonConvert.SerializeObject(extModel.FileList);
+                    }
+                }
+            }
+
             var flag = travelContractModule.SetTravelContractModule(extModel, out int Id);
             return flag ? ApiResult.Success("操作成功!", data: Id) : ApiResult.Failed("操作失败!");
         }