1

REBORN.Module.DMCModule/TravelContractModule.cs

@@ -698,7 +698,13 @@ namespace REBORN.Module.DMCModule
                         {
                             //已签名的  更新状态为 待作废签名
                             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
-                                { nameof(RB_Contract_Extend.ThirdContractState),5},                                
+                                { nameof(RB_Contract_Extend.ThirdContractState),5},
+                            };
+                            contractRepository.Update(keyValues, new WhereHelper(nameof(RB_Contract_Extend.Id), Id));
+                        }
+                        else if (model.ThirdContractState == 1) {
+                            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                                { nameof(RB_Contract_Extend.ThirdContractState),3},
                             };
                             contractRepository.Update(keyValues, new WhereHelper(nameof(RB_Contract_Extend.Id), Id));
                         }
@@ -1913,13 +1919,20 @@ namespace REBORN.Module.DMCModule
                     {
                         var result = service.InvalidateContract(model.ThirdContractID);
                         LogHelper.WriteInfo(JsonHelper.Serialize(result));
-                        if (model.ThirdContractState == 2) {
+                        if (model.ThirdContractState == 2)
+                        {
                             //已签名的  更新状态为 待作废签名
                             Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                                 { nameof(RB_Travel_Contract_Extend.ThirdContractState),5}
                             };
                             flag = travel_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Travel_Contract_Extend.ID), Id));
                         }
+                        else if(model.ThirdContractState == 1) {
+                            Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                                { nameof(RB_Travel_Contract_Extend.ThirdContractState),3}
+                            };
+                            flag = travel_ContractRepository.Update(keyValues, new WhereHelper(nameof(RB_Travel_Contract_Extend.ID), Id));
+                        }
                     }
                     #endregion
                 }

REBORN.Module.SellModule/CRMModule.cs

@@ -572,7 +572,7 @@ namespace REBORN.Module.SellModule
                     //    item.StateName = cmodel?.Code ?? "";
                     //    item.CurrencyName = cmodel?.Name ?? "";
                     //}
-                    var cmodel = currencyList.Where(x => x.Code == "RMB").FirstOrDefault();//画途 这一套 固定人民币
+                    var cmodel = currencyList.Where(x => x.Code == "CNY").FirstOrDefault();//画途 这一套 固定人民币
                     item.OrderId = cmodel?.ID ?? 0;
                     item.StateName = cmodel?.Code ?? "";
                     item.CurrencyName = cmodel?.Name ?? "";