Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -5407,6 +5407,8 @@ namespace REBORN.Module.SellModule
                     { nameof(RB_CRMTicket_Order_Extend.SupplierId), demodel.SupplierId},
                     { nameof(RB_CRMTicket_Order_Extend.FinalPriceTips), demodel.FinalPriceTips},
                     { nameof(RB_CRMTicket_Order_Extend.GuestInfo), demodel.GuestInfo},
+                    { nameof(RB_CRMTicket_Order_Extend.EnterID), demodel.EnterID},
+                    { nameof(RB_CRMTicket_Order_Extend.EmpBranchId), demodel.EmpBranchId},
                 };
                 List<WhereHelper> wheres = new List<WhereHelper>() {
                     new WhereHelper(){
@@ -5496,6 +5498,10 @@ namespace REBORN.Module.SellModule
                     {
                         Content += ",旅客名单调整";
                     }
+                    if (oldModel.EnterID != demodel.EnterID)
+                    {
+                        Content += $",修改销售由【{oldModel.EnterID}】修改为【{demodel.EnterID}】";
+                    }
 
                     ticketOrder_LogRepository.Insert(new Model.Entity.Sell.RB_TicketOrder_Log()
                     {

REBORN.Services.SellService/CustomerOrderService.cs

@@ -3334,7 +3334,7 @@ namespace REBORN.Services.SellService
                 LossFinishTime = x.LossFinishTime.HasValue ? x.LossFinishTime.Value.ToString("yyyy-MM-dd HH:mm") : "",
                 DepartTime = x.DepartTime.HasValue ? x.DepartTime.Value.ToString("yyyy-MM-dd") : "",
                 InvoiceApplyList = x.InvoiceApplyList.Select(y => new { y.ID, y.ApplyMoney, y.InvoiceApplyState }),
-                ContractNum = x?.ContractNum ?? new List<RB_Contract_Extend>(),
+                //ContractNum = x?.ContractNum ?? new List<RB_Contract_Extend>(),
                 x.LineId,
                 x.LineName,
                 x.OPRemark,
@@ -3351,7 +3351,17 @@ namespace REBORN.Services.SellService
                 //    y.PassportNo,
                 //    y.Tel
                 //}),
-                x.OtherContractList,
+                OtherContractList = x.OtherContractList?.Select(z=> new { 
+                    z.ID,
+                    z.T_ContractNum,
+                    z.CType,
+                    z.ContractStatus,
+                    z.ContractTemplete,
+                    z.OrderId,
+                    z.Status,
+                    z.StatusStr,
+                    z.Type,
+                }),
                 ContractType = Common.Enum.ResourceTypeEnum.SingleTicket,
                 SupplierModel = new { SupplierId = x?.SupplierModel?.ID ?? 0, SupplierName = x?.SupplierModel?.Name ?? "", Tel = x?.SupplierModel?.Tel ?? "", Contact = x?.SupplierModel?.Contact ?? "", CompanyName = x?.SupplierModel?.CompanyName ?? "", DutyParagraph = x?.SupplierModel?.DutyParagraph ?? "", CompanyPhone = x?.SupplierModel?.CompanyPhone ?? "", OpeningBank = x?.SupplierModel?.OpeningBank ?? "", BankNo = x?.SupplierModel?.BankNo ?? "" },
                 AppointOPList = x.AppointOPList?.Select(z => new { z.OPId, OPName = CacheManager.User.RbUserCache.GetUserLoginInfo(z.OPId.ToString())?.emName ?? "" }),
@@ -3737,12 +3747,16 @@ namespace REBORN.Services.SellService
             if (!appointOPList.Any()) { return ApiResult.ParamIsNull("请指定OP"); }
 
             demodel.OrderStatus = (int)CRMOrderStatusEnum.Normal;//默认正常订单
+            demodel.EmpBranchId = userInfo.RB_Branch_id;
             if (demodel.EnterID <= 0)
             {
                 demodel.EnterID = userInfo.EmployeeId;//可以设置销售
             }
+            else {
+                //查询一下 公司别
+                demodel.EmpBranchId = CacheManager.User.RbUserCache.GetUserLoginInfo(demodel.EnterID.ToString())?.RB_Branch_id;
+            }
             demodel.CreateBy = userInfo.EmployeeId;
-            demodel.EmpBranchId = userInfo.RB_Branch_id;
             demodel.CreateTime = DateTime.Now;
 
             string msg = customerOrderModule.SetGuestOrderInfo(demodel, travelGuestList, supplierModel, clientBankAccountList, appointOPList, userInfo);