11

REBORN.Module.SellModule/SellOrderModule.cs

@@ -17537,7 +17537,7 @@ namespace REBORN.Module.SellModule
                 //出境合同
                 var contractList = contractRepository.GetContractListRepository("", OrderStr);
                 //其它合同
-                var otherContractList = travel_ContractRepository.GetTravelContractListRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1, Type = ResourceTypeEnum.TeamPrice });
+                var otherContractList = travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1, Type = ResourceTypeEnum.TeamPrice });
 
                 #region 同行联系人LD
                 var customerChildList = new List<Rb_Customer_InfoChildren>();
@@ -17628,6 +17628,7 @@ namespace REBORN.Module.SellModule
                     #region 自动发放优惠券id
                     item.AutoCouponId = order_AutoCouponList?.FirstOrDefault(x => x.OrderId == item.OrderId)?.Status ?? -1;
                     #endregion
+
                     #region 旅客信息
                     var tempGuestList = guestList?.Where(y => item.OrderId == (y.OrderId ?? 0)).ToList() ?? new List<RB_Travel_Guest_Extend>();
                     foreach (var gItem in tempGuestList)
@@ -18026,22 +18027,7 @@ namespace REBORN.Module.SellModule
                     if (((((item.PreferTipAmount ?? 0) > (item.CompensationMoney ?? 0) ? ((item.PreferTipAmount ?? 0) - (item.CompensationMoney ?? 0)) : 0)) + (item.PreferPrice ?? 0) - (item.Income ?? 0) - (item.CashReceiptsMoney ?? 0) + (item.Refund ?? 0) - (item.PlatformTax ?? 0) - (item.ZaiTu ?? 0) - (item.DiscountMoney ?? 0) - (item.RedEnvelopeMoney ?? 0)) == 0)
                     {
                         item.orderChangePriceModel.ApplyForState = 3;
-                        //if ((item?.orderChangePriceModel?.ID ?? 0) > 0)//表示有申请
-                        // {
-                        //if (!item.orderChangePriceModel.ExamineTime.HasValue)
-                        //{
-                        //    var nowLogList = orderLogList?.Where(x => x.OrderId == item.OrderId)?.OrderByDescending(x => x.UpdateDate)?.ToList() ?? new List<RB_Travel_Order_LogExtend>();
-                        //    if (nowLogList != null && nowLogList.Any())
-                        //    {
-                        //        item.orderChangePriceModel.ExamineTime = nowLogList?.FirstOrDefault()?.UpdateDate;
-                        //    }
-                        //    else
-                        //    {
-                        //        item.orderChangePriceModel = new RB_Travel_OrderChangePrice_Extend();
-                        //    }
-
-                        //}
-                        // }
+                        
                     }
 
                     #region 处理同行联系人LD

REBORN.Services.SellService/CustomerService.cs

@@ -6206,15 +6206,20 @@ namespace REBORN.Services.SellService
             dictValueModel.RB_Branch_id = userInfo.RB_Branch_id;
             dictValueModel.RB_Group_id = userInfo.RB_Group_id;
             var list = customerModule.GetDictValueList(pmodel.pageIndex, pmodel.pageSize, dictValueModel, out long count);
-            var data = list.Select(x => new
+            List<object> data = new List<object>();
+            foreach (var item in list)
             {
-                x.ID,
-                x.SNO,
-                x.Name,
-                CreateBy = CacheManager.User.RbUserCache.GetEmployee(x.CreateBy)?.EmName ?? "",
-                CreatePhoto = Config.GetFileUrl(CacheManager.User.RbUserCache.GetEmployee(x.CreateBy)?.EmPhoto ?? ""),
-                x.CreateDate
-            });
+                var tempUser = CacheManager.User.RbUserCache.GetEmployee(item.CreateBy);
+                data.Add(new
+                {
+                    item.ID,
+                    item.SNO,
+                    item.Name,
+                    CreateBy = tempUser?.EmName ?? "",
+                    CreatePhoto = Config.GetFileUrl(tempUser?.EmPhoto ?? ""),
+                    item.CreateDate
+                });
+            }
             pmodel.count = int.Parse(count.ToString());
             pmodel.pageData = data;
             return ApiResult.Success("", data: JsonHelper.GetCamelCaseResultJson(pmodel));