1、合同调整

REBORN.Common/ContractAPI/Models.cs

@@ -29,6 +29,14 @@ namespace OneTwoThreeZeroOne.EContracts {
         [JsonPropertyName("isMultiSignatory")]
         public bool IsMultiSignatory { get; set; }
 
+        /// <summary>合同份数</summary>
+        [JsonPropertyName("contractNum")]
+        public string ContractNum { get; set; }
+
+        /// <summary>各持几份</summary>
+        [JsonPropertyName("holdNum")]
+        public string HoldNum { get; set; }
+
         /// <summary>补充条款</summary>
         [JsonPropertyName("supplementaryClause")]
         public string SupplementaryClause { get; set; }
@@ -96,6 +104,15 @@ namespace OneTwoThreeZeroOne.EContracts {
         /// <summary>委托事项</summary>
         [JsonPropertyName("entrustment")]
         public Entrustment Entrustment { get; set; }
+
+        /// <summary>地接社信息</summary>
+        [JsonPropertyName("localTravelAgencies")]
+        public LocalTravelAgencies[] LocalTravelAgencies { get; set; }
+
+
+        /// <summary>旅行社监督、投诉信息</summary>
+        [JsonPropertyName("complaint")]
+        public Complaint Complaint { get; set; }
     }
 
     /// <summary>合同申报结果（对应接口2.1.2返回）</summary>
@@ -508,6 +525,8 @@ namespace OneTwoThreeZeroOne.EContracts {
         [JsonPropertyName("isChild")] public bool IsChild { get; set; }
         /// <summary>国籍</summary>
         [JsonPropertyName("nationality")] public string Nationality { get; set; }
+        /// <summary>生日</summary>
+        [JsonPropertyName("birthday")] public string Birthday { get; set; }
         /// <summary>民族</summary>
         [JsonPropertyName("race")] public string Race { get; set; }
         /// <summary>手机号码</summary>
@@ -596,6 +615,10 @@ namespace OneTwoThreeZeroOne.EContracts {
         [JsonPropertyName("excludeNote")] public string ExcludeNote { get; set; }
         /// <summary>费用支付说明</summary>
         [JsonPropertyName("paymentDescription")] public string PaymentDescription { get; set; }
+        /// <summary>银行账号（支付方式为转账时填写）</summary>
+        [JsonPropertyName("payBankCard")] public string PayBankCard { get; set; }
+        /// <summary>其他支付方式说明（支付方式为其他时填写）</summary>
+        [JsonPropertyName("paymentOther")] public string PaymentOther { get; set; }
     }
 
     /// <summary>保险信息（对应文档2.1.2中的保险部分）</summary>
@@ -625,6 +648,8 @@ namespace OneTwoThreeZeroOne.EContracts {
     {
         /// <summary>日期(YYYY-MM-DD)</summary>
         [JsonPropertyName("date")] public string Date { get; set; }
+        /// <summary>日期(YYYY-MM-DD HH)</summary>
+        [JsonPropertyName("activityDate")] public string ActivityDate { get; set; }
         /// <summary>地点</summary>
         [JsonPropertyName("place")] public string Place { get; set; }
         /// <summary>项目名称</summary>
@@ -642,6 +667,9 @@ namespace OneTwoThreeZeroOne.EContracts {
     {
         /// <summary>日期(YYYY-MM-DD)</summary>
         [JsonPropertyName("date")] public string Date { get; set; }
+
+        /// <summary>日期(YYYY-MM-DD HH)</summary>
+        [JsonPropertyName("shoppingDate")] public string ShoppingDate { get; set; }
         /// <summary>购物地点</summary>
         [JsonPropertyName("place")] public string Place { get; set; }
         /// <summary>购物场所名称</summary>
@@ -907,5 +935,28 @@ namespace OneTwoThreeZeroOne.EContracts {
         /// <summary>证件信息</summary>
         [JsonPropertyName("ID")] public TouristId ID { get; set; }
     }
+
+    /// <summary>地接社信息</summary>
+    public sealed class LocalTravelAgencies {
+        /// <summary>地接社名称</summary>
+        [JsonPropertyName("agencyName")] public string AgencyName { get; set; }
+        /// <summary>联系人</summary>
+        [JsonPropertyName("contactName")] public string ContactName { get; set; }
+        /// <summary>联系电话</summary>
+        [JsonPropertyName("contactPhone")] public string ContactPhone { get; set; }
+        /// <summary>地接社地址</summary>
+        [JsonPropertyName("agencyAddress")] public Address AgencyAddress { get; set; }
+    }
+
+    /// <summary>旅行社监督、投诉信息</summary>
+    public sealed class Complaint
+    {
+        /// <summary>省</summary>
+        [JsonPropertyName("complaintProvince")] public string ComplaintProvince { get; set; }
+        /// <summary>市</summary>
+        [JsonPropertyName("complaintCity")] public string ComplaintCity { get; set; }
+        /// <summary>电话区号</summary>
+        [JsonPropertyName("complaintAreaCode")] public string ComplaintAreaCode { get; set; }
+    }
     #endregion
 }

REBORN.Model/Entity/Dmc/RB_Contract.cs

@@ -1050,5 +1050,20 @@ namespace REBORN.Model.Entity.Dmc
         /// 合团附件  最多3个，只支持 PDF docx
         /// </summary>
         public string FileUrl { get; set; }
+
+        /// <summary>
+        /// 地接社地址
+        /// </summary>
+        public string DmcAddress { get; set; }
+
+        /// <summary>
+        /// 地接社联系人
+        /// </summary>
+        public string DmcContact { get; set; }
+
+        /// <summary>
+        /// 地接社联系电话
+        /// </summary>
+        public string DmcContactPhone { get; set; }
     }
 }

REBORN.Services.DMCService/TravelContractService.cs

@@ -310,6 +310,10 @@ namespace REBORN.Services.DMCService
                 FinalPrice = parm.GetDecimal("finalPrice"),
                 PriceDescription = parm.GetStringValue("priceDescription"),
                 IsApplyContract = parm.GetInt("isApplyContract"),//是否上传合同
+                DmcName = parm.GetStringValue("dmcName"),
+                DmcAddress = parm.GetStringValue("dmcAddress"),
+                DmcContact = parm.GetStringValue("dmcContact"),
+                DmcContactPhone = parm.GetStringValue("dmcContactPhone"),
             };
 
             #region 去除Html标签
@@ -432,7 +436,6 @@ namespace REBORN.Services.DMCService
             {
                 model.CreateBy = userInfo.EmployeeId;
                 model.CreateTime = DateTime.Now;
-                model.RB_Group_Id = userInfo.RB_Group_id;
                 model.RB_Branch_Id = userInfo.RB_Branch_id;
                 model.IsTravelAgencySignature = 0;
                 model.AuditContract = 0;
@@ -474,6 +477,7 @@ namespace REBORN.Services.DMCService
                 model.Id = oldModel?.Id ?? 0;
             }
             //判断是否存在
+            model.RB_Group_Id = userInfo.RB_Group_id;
             model.UpdateBy = userInfo.EmployeeId;
             model.UpdateTime = DateTime.Now;
             var flag = travelContractModule.SetContractModule(model);
@@ -598,6 +602,10 @@ namespace REBORN.Services.DMCService
                     IsTravelAgencySignature = 0,
                     AuditContract = 0,
                     PriceDescription = oldModel.PriceDescription,
+                    DmcName = oldModel.DmcName,
+                    DmcContact = oldModel.DmcContact,
+                    DmcContactPhone = oldModel.DmcContactPhone,
+                    DmcAddress = oldModel.DmcAddress,
                 };
                 model.EnterId = travelContractModule.GetTravelOrder(model.OrderId ?? 0)?.EnterID ?? 0;
 
@@ -1040,7 +1048,11 @@ namespace REBORN.Services.DMCService
                 thirdContractQRCode = model?.ThirdContractQRCode,
                 thirdContractFileUrl = model?.ThirdContractFileUrl,
                 contractTemplete = model?.ContractTemplete,
-                fileList = !string.IsNullOrEmpty(model?.FileUrl) ? JsonHelper.DeserializeObject<List<ContractFile>>(model?.FileUrl) : new List<ContractFile>()
+                fileList = !string.IsNullOrEmpty(model?.FileUrl) ? JsonHelper.DeserializeObject<List<ContractFile>>(model?.FileUrl) : new List<ContractFile>(),
+                dmcName = model?.DmcName,
+                dmcAddress = model?.DmcAddress,
+                dmcContact = model?.DmcContact,
+                dmcContactPhone = model?.DmcContactPhone,
             };
             return ApiResult.Success(data: result);
         }
@@ -2179,5 +2191,19 @@ namespace REBORN.Services.DMCService
             return ApiResult.Success("操作成功！", data: obj);
         }
         #endregion
+
+        #region 获取地接社信息
+        /// <summary>
+        /// 获取地接社信息
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public virtual ApiResult GetDmcCompanyList(RequestParm request)
+        {
+            UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
+            var list = travelContractModule.GetDmcCompanyList(userInfo.RB_Group_id);
+            return ApiResult.Success("", list);
+        }
+        #endregion
     }
 }

REBORN.WebApi/AppStting/dmcstatics.json

@@ -750,5 +750,10 @@
     "fullName": "REBORN.Services.DMCService.DMCTicketLossService",
     "method": "SetTravelTicketLoss",
     "checkFormRepeatSubmit": true //验证表单重复提交
+  },
+  {
+    "cmd": "travelcontract_post_GetDmcCompanyList", //获取地接社列表
+    "fullName": "REBORN.Services.DMCService.TravelContractService",
+    "method": "GetDmcCompanyList"
   }
 ]