1

REBORN.Common/ContractAPI/EContractClientV2.cs

@@ -121,7 +121,9 @@ namespace OneTwoThreeZeroOne.ContractService{
             using (var response = request.GetResponse())
             using (var reader = new StreamReader(response.GetResponseStream()))
             {
-                return JsonConvert.DeserializeObject<BaseResponse>(reader.ReadToEnd());
+                string rstr = reader.ReadToEnd();
+                LogHelper.Write("作废合同：" + rstr);
+                return JsonConvert.DeserializeObject<BaseResponse>(rstr);
             }
         }
 
@@ -147,7 +149,9 @@ namespace OneTwoThreeZeroOne.ContractService{
             using (var response = request.GetResponse())
             using (var reader = new StreamReader(response.GetResponseStream()))
             {
-                return JsonConvert.DeserializeObject<BaseResponse>(reader.ReadToEnd());
+                string rd = reader.ReadToEnd();
+                LogHelper.Write("重发短信：" + rd);
+                return JsonConvert.DeserializeObject<BaseResponse>(rd);
             }
         }
 

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -677,7 +677,7 @@ namespace REBORN.Module.DMCModule
             if (flag)
             {
                 var model = contractRepository.GetEntity(Id);
-                if (!string.IsNullOrEmpty(model.ThirdContractID) && model.ThirdContractState == 1)
+                if (!string.IsNullOrEmpty(model.ThirdContractID) && (model.ThirdContractState == 1 || model.ThirdContractState == 2))
                 {
                     //只有客人未签字 可以作废
                     #region 初始化旅游局Key
@@ -1886,6 +1886,21 @@ namespace REBORN.Module.DMCModule
                 fileds.Add(nameof(RB_Travel_Contract_Extend.IsTravelAgencySignature), 0);
                 fileds.Add(nameof(RB_Travel_Contract_Extend.Tourists_Sign), "");
             }
+            if (Status == 5) {
+                var model = travel_ContractRepository.GetEntity(Id);
+                if (!string.IsNullOrEmpty(model.ThirdContractID) && (model.ThirdContractState == 1 || model.ThirdContractState == 2))
+                {
+                    //只有客人未签字 可以作废
+                    #region 初始化旅游局Key
+                    TourismContractService service = GetContractService(model.RB_Group_Id ?? 0, model.RB_Branch_Id ?? 0, out string cmsg);
+                    if (cmsg == "")
+                    {
+                        var result = service.InvalidateContract(model.ThirdContractID);
+                        LogHelper.WriteInfo(JsonHelper.Serialize(result));
+                    }
+                    #endregion
+                }
+            }
             flag = travel_ContractRepository.Update(fileds, new WhereHelper(nameof(RB_Travel_Contract_Extend.ID), Id));
             return flag;
         }

REBORN.Services.DMCService/TravelContractService.cs

@@ -193,7 +193,7 @@ namespace REBORN.Services.DMCService
             int ContractType = parm.GetInt("ContractType");//1团队合同   2单项
 
             string msg = travelContractModule.ReSendContract(ContractId, ContractType, userInfo);
-            return msg == "" ? ApiResult.Success("操作成功！") : ApiResult.Failed("操作失败！");
+            return msg == "" ? ApiResult.Success("操作成功！") : ApiResult.Failed(msg);
         }
 
         /// <summary>