Skip to content

H
huatu_API
Commit 0e37d9f4 authored by 吴春's avatar 吴春
Browse files
Options

11

parent ac7562ea
Hide whitespace changes
Inline Side-by-side
Showing with 165 additions and 157 deletions
REBORN.Module.SellModule/SellOrderModule.cs
View file @ 0e37d9f4
......@@ -18765,6 +18765,8 @@ namespace REBORN.Module.SellModule
{
var list = orderRepository.GetTravelOrderPage2026Repository(pageIndex, pageSize, model, out count, lineIdStr: lineIdStr, isGetLeader: isGetLeader);
List<int> OrderIntL = list.Select(x => x.OrderId).ToList();
List<Rb_Coupon_Allot_Extend> couponList = new List<Rb_Coupon_Allot_Extend>();
List<int> couponIdList = new List<int>();
if (OrderIntL.Count > 0)
{
//团号
......@@ -18780,47 +18782,40 @@ namespace REBORN.Module.SellModule
{
listF.AddRange(listF2);
}
var discountProtocolList = discount_ProtocolRepository.GetDiscountProtocolListRepository(new RB_Discount_Protocol_Extend() { RB_Group_Id = (model?.RB_Group_Id ?? 0), QOrderIds = OrderStr });
var disclaimerProtocolList = disclaimer_ProtocolRepository.GetDisclaimerProtocolListRepository(new RB_Disclaimer_Protocol_Extend() { RB_Group_Id = (model?.RB_Group_Id ?? 0), QOrderIds = OrderStr });
#region 改价申请信息
//改价申请信息
var orderChangePriceList = travelOrderChangePriceRepository.GetListReposity(new RB_Travel_OrderChangePrice_Extend { QOrderIds = OrderStr });
if (orderChangePriceList != null && orderChangePriceList.Any())
{
orderChangePriceList?.Where(x => x.ManagerExamineBy > 0).ToList()?.ForEach(x => x.ManagerExamineName = CacheManager.User.RbUserCache.GetUserLoginInfo(x.ManagerExamineBy.ToString())?.emName ?? "");
orderChangePriceList?.Where(x => x.ExamineBy > 0).ToList()?.ForEach(x => x.ExamineByName = CacheManager.User.RbUserCache.GetUserLoginInfo(x.ExamineBy.ToString())?.emName ?? "");
}
#endregion
//特价
var travelOrderSpecialOfferList = new List<RB_Travel_OrderSpecialOffer_Extend>();
//travelOrderSpecialOfferList= orderSpecialOfferRepository.GetListByOrderIds(OrderStr);
#region 特价
var travelOrderSpecialOfferList = orderSpecialOfferRepository.GetListByOrderIds(OrderStr);
#endregion
#region 旅客信息
//旅客信息
var guestList = GetTravelGuestList_V2(new RB_Travel_Guest_Extend { OrderIds = OrderStr, IsAllograph = 2, Status = -1 });
#endregion
//获取旅客小费关联财务单据列表
var TipList = relation_TipGuestRepository.GetList_V2(new Model.Extend.Finance.RB_Finance_Relation_TipGuest_Extend() { OrderIdStr = OrderStr, Source = (int)OrderResourceEnum.Travel });
#region 分房信息
//分房信息
var houseGuest = orderGuestHouseRepository.GetOrderGuestHouse_V2(new RB_Travel_OrderGuestHouse_Extend { OrderIds = OrderStr });
#endregion
#region 获取旅客评论分数
var guestSurveyList = guestSurveyRepository.GetListInfo_V2(new Rb_Travel_GuestSurvey_Extend { OrderIds = OrderStr });
#endregion
//获取旅客评论分数
var guestSurveyList = new List<Rb_Travel_GuestSurvey_Extend>();
//guestSurveyList= guestSurveyRepository.GetListInfo_V2(new Rb_Travel_GuestSurvey_Extend { OrderIds = OrderStr });
#region 投诉
//投诉
var compainlist = complainRepository.GetList_V2(new RB_Complain_Extend() { OrderIdStr = OrderStr });
#endregion
#region 确认函信息
//确认函信息
var orderConfirmationList = orderConfirmationRepository.GetListByOrderIds_V2(OrderStr);
#endregion
List<Model.Extend.Finance.Rb_Workflow_AuditRelevance_Extend> arlist = new List<Model.Extend.Finance.Rb_Workflow_AuditRelevance_Extend>();
if (listF.Any())
{
......@@ -18871,22 +18866,26 @@ namespace REBORN.Module.SellModule
var AccountTypeModel = accountTypeRepository.GetList(new Model.Extend.Finance.RB_AccountType_Extend() { RB_Group_Id = model.RB_Group_Id, Name = "平台账户" }).FirstOrDefault();
//照片服务信息
var photoList = order_PhotoRepository.GetList_V2(new RB_Travel_Order_Photo() { RB_Group_id = model.RB_Group_Id }, "", OrderStr);
var photoList = new List<RB_Travel_Order_Photo>();
//photoList= order_PhotoRepository.GetList_V2(new RB_Travel_Order_Photo() { RB_Group_id = model.RB_Group_Id }, "", OrderStr);
//发票申请列表
var invoiceApplyList = invoiceApplyRepository.GetList_V2(new RB_Travel_InvoiceApply_Extend { QOrderIds = OrderStr, InvoiceApplyType = InvoiceApplyTypeEnum.GroupOrder, IsSelectInvoiceOrder = 1 });
//可退景点
var backScenicList = backScenicRepository.GetListExt_V2(new RB_Travel_Order_BackScenic_Extend() { QOrderIds = OrderStr });
var backScenicList = new List<RB_Travel_Order_BackScenic_Extend>();
//backScenicList= backScenicRepository.GetListExt_V2(new RB_Travel_Order_BackScenic_Extend() { QOrderIds = OrderStr });
//旅客可退景点
var guestBackScenicList = guestBackScenicRepository.GetListGuestBackScenicByOrderIds(OrderStr);
var guestBackScenicList = new List<RB_Travel_Order_GuestBackScenic_Extend>();
//guestBackScenicList= guestBackScenicRepository.GetListGuestBackScenicByOrderIds(OrderStr);
//出境合同
var contractList = contractRepository.GetContractListRepository("", OrderStr);
//其它合同
var otherContractList = travel_ContractRepository.GetTravelContractListRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
var otherContractList = travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
#region 同行联系人LD
var customerChildList = new List<Rb_Customer_InfoChildren>();
......@@ -18901,12 +18900,20 @@ namespace REBORN.Module.SellModule
var order_AutoCouponList = order_AutoCouponRepository.GetList(new RB_Order_AutoCoupon(), OrderStr);
#endregion
#region 查询关联账单
//查询关联账单
//var billList = travel_BillDetailRepository.GetBillList(new RB_Travel_BillDetail_Extend() { GroupId = model.RB_Group_Id ?? 0, Type = 2, OrderType = CRMMergeOrderTypeEnum.Travel, OrderIds = OrderStr });
#endregion
foreach (var item in list)
{
if (!string.IsNullOrEmpty(item.CouponAllotIds))
{
var tempIdList = Common.ConvertHelper.ToListInt(item.CouponAllotIds);
if (tempIdList != null && tempIdList.Count > 0)
{
couponIdList.AddRange(tempIdList);
}
}
item.AutoCouponId = order_AutoCouponList?.FirstOrDefault(x => x.OrderId == item.OrderId)?.Status ?? -1;
//旅客信息
......@@ -18918,12 +18925,13 @@ namespace REBORN.Module.SellModule
var tempDisclaimerProtocol = disclaimerProtocolList?.Where(qitem => qitem.OrderId == item.OrderId && qitem.GuestId == gItem.Id)?.FirstOrDefault();
gItem.DisclaimerId = tempDisclaimerProtocol?.ProtocolId ?? 0;
}
var photoCList = photoList.Where(x => x.OrderId == item.OrderId).ToList();
item.PhotoNum = photoCList.FirstOrDefault()?.Number ?? 0;
var photoGuestIdList = photoCList.Select(x => x.GuestId ?? 0).Distinct().ToList();
tempGuestList.ForEach(x => x.IsApplyPhoto = 0);
if (tempGuestList != null && tempGuestList.Any() && photoGuestIdList != null && photoGuestIdList.Any())
{
tempGuestList.Where(a => photoGuestIdList.Exists(t => a.Id.ToString().Contains(t.ToString()))).ToList().ForEach(x => x.IsApplyPhoto = 1);
......@@ -19165,52 +19173,65 @@ namespace REBORN.Module.SellModule
#endregion
}
}
//获取优惠券信息
if (isGetCouponAllotInfo)
{
foreach (var item in list)
if (couponIdList != null && couponIdList.Count > 0)
{
if (!string.IsNullOrWhiteSpace(item.CouponAllotIds))
string couponIds = string.Join(",", couponIdList.Distinct());
if (!string.IsNullOrEmpty(couponIds))
{
var couponAllotList = couponAllotRepository.GetCouponAllotListByIds(item.CouponAllotIds);
foreach (var itemC in couponAllotList)
couponList = couponAllotRepository.GetCouponAllotListByIds(couponIds);
}
}
if (couponList != null && couponList.Count > 0)
{
foreach (var item in list)
{
if (!string.IsNullOrWhiteSpace(item.CouponAllotIds))
{
if (itemC.IsExpansion == 1 && !string.IsNullOrWhiteSpace(itemC.ExpansionInfo))
var orderCouponIdList = Common.ConvertHelper.ToListInt(item.CouponAllotIds);
var couponAllotList = couponList?.Where(qitem => orderCouponIdList.Contains(qitem.Id))?.ToList();
foreach (var itemC in couponAllotList)
{
try
if (itemC.IsExpansion == 1 && !string.IsNullOrWhiteSpace(itemC.ExpansionInfo))
{
ExpansionModel nowExpansionModel = new ExpansionModel();
nowExpansionModel = JsonConvert.DeserializeObject<ExpansionModel>(itemC.ExpansionInfo);
var lineList = Common.ConvertHelper.ToListInt(itemC.CheckInLine);
if (lineList != null && lineList.Any(x => x == (item.LineId)) && nowExpansionModel.denomination > 0)
try
{
ExpansionModel nowExpansionModel = new ExpansionModel();
nowExpansionModel = JsonConvert.DeserializeObject<ExpansionModel>(itemC.ExpansionInfo);
var lineList = Common.ConvertHelper.ToListInt(itemC.CheckInLine);
if (lineList != null && lineList.Any(x => x == (item.LineId)) && nowExpansionModel.denomination > 0)
{
itemC.Denomination = Convert.ToDouble(nowExpansionModel.denomination);
}
}
catch
{
itemC.Denomination = Convert.ToDouble(nowExpansionModel.denomination);
}
}
catch
{
}
}
item.CouponAllotList = couponAllotList;
}
item.CouponAllotList = couponAllotList;
}
else
{
item.CouponAllotList = new List<Rb_Coupon_Allot_Extend>();
}
if (!string.IsNullOrEmpty(item.DisType) && item.DisValue > 0)
{
item.CouponAllotList.Add(new Rb_Coupon_Allot_Extend()
else
{
CouponsName = item.DisType,
CouponId = 0,
CouponsType = item.DisType.Contains("打") ? 2 : 1,
Denomination = Convert.ToDouble(item.DisValue),
UseCondition = 0,
AccessType = 0,
Remark = "",
IsExpansion = 0
});
item.CouponAllotList = new List<Rb_Coupon_Allot_Extend>();
}
if (!string.IsNullOrEmpty(item.DisType) && item.DisValue > 0)
{
item.CouponAllotList.Add(new Rb_Coupon_Allot_Extend()
{
CouponsName = item.DisType,
CouponId = 0,
CouponsType = item.DisType.Contains("打") ? 2 : 1,
Denomination = Convert.ToDouble(item.DisValue),
UseCondition = 0,
AccessType = 0,
Remark = "",
IsExpansion = 0
});
}
}
}
}
REBORN.Repository/Dmc/RB_Travel_ContractRepository.cs
View file @ 0e37d9f4
......@@ -93,6 +93,87 @@ WHERE 1=1
return Get<RB_Travel_Contract_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 根据查询条件获取合同列表
/// </summary>
/// <param name="where">查询条件</param>
/// <returns></returns>
public List<RB_Travel_Contract_Extend> GetTravelContractListNewRepository(RB_Travel_Contract_Extend where)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT A.ID,A.CType,A.T_ContractNum,A.Tourists_Name,A.TCID,A.OrderId,A.ContractTemplete,A.ThirdContractState
FROM RB_Travel_Contract AS A
WHERE 1=1
");
builder.Append(" AND A.Status<>5 ");//排除作废的
if (where != null)
{
if (where.RB_Group_Id > 0)
{
builder.AppendFormat(" AND A.RB_Group_Id ={0} ", where.RB_Group_Id);
}
if (where.TCID > 0)
{
builder.AppendFormat(" AND A.TCID={0} ", where.TCID);
}
if (where.ID > 0)
{
builder.AppendFormat(" AND A.ID={0} ", where.ID);
}
if (where.CustomerId > 0)
{
builder.AppendFormat(" AND A.CustomerId={0} ", where.CustomerId);
}
if (where.CType.HasValue && where.CType > 0)
{
builder.AppendFormat(" AND A.CType={0} ", where.CType);
}
if (!string.IsNullOrEmpty(where.QTCIDs))
{
builder.AppendFormat(" AND A.TCID IN({0}) ", where.QTCIDs);
}
if (where.OrderId > 0)
{
builder.AppendFormat(" AND A.OrderId={0} ", where.OrderId);
}
if (where.Type.HasValue && (int)where.Type.Value > 0)
{
builder.AppendFormat(" AND A.Type={0} ", (int)where.Type.Value);
}
if (where.Status != null && where.Status > -1)
{
builder.AppendFormat(" AND A.Status={0} ", where.Status);
}
if (where.ContractStatus > 0)
{
builder.AppendFormat(" AND A.ContractStatus={0} ", where.ContractStatus);
}
if (!string.IsNullOrEmpty(where.QOrderIds))
{
builder.AppendFormat(" AND A.OrderId IN({0}) ", where.QOrderIds);
}
if (!string.IsNullOrEmpty(where.QCustomerIds))
{
builder.AppendFormat(" AND A.CustomerId IN({0}) ", where.QCustomerIds);
}
if (!string.IsNullOrEmpty(where.QAllianceIds))
{
builder.AppendFormat(" AND A.AllianceId IN({0}) ", where.QAllianceIds);
}
if (where.AllianceId > 0)
{
builder.AppendFormat(" AND A.AllianceId={0} ", where.AllianceId);
}
if (!string.IsNullOrEmpty(where.ThirdContractID))
{
builder.AppendFormat(" AND A.ThirdContractID='{0}' ", where.ThirdContractID);
}
}
return Get<RB_Travel_Contract_Extend>(builder.ToString()).ToList();
}
/// <summary>
/// 获取合同分页列表
/// </summary>
......
REBORN.Services.SellService/SellOrderService.cs
View file @ 0e37d9f4
......@@ -12522,16 +12522,7 @@ namespace REBORN.Services.SellService
pageSize = parm.GetInt("pageSize"),
};
UserInfo userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
//再查询一次 防止缓存丢失
if (string.IsNullOrWhiteSpace(userInfo.ActionMenuCode))
{
var ActionMenuList = sellOrderModule.GetActionCodeForUrlAndUser(userInfo.RB_Post_Id, "");
if (ActionMenuList != null && ActionMenuList.Count() > 0)
{
userInfo.ActionMenuCode = string.Join(",", ActionMenuList?.Select(x => x.ActionCode).ToList());
}
}
RB_Travel_Order_Extend OrderInfo = new RB_Travel_Order_Extend()
{
BranchId = parm.GetInt("BranchId"),
......@@ -12554,92 +12545,7 @@ namespace REBORN.Services.SellService
tempOrderId = parm.GetInt("tempOrderId"),
RB_Department_Id = parm.GetInt("RB_Department_Id"),
};
if (OrderInfo.IsUnionOrder == 1 || OrderInfo.IsLeaderOrder == 1)
{
}
else
{
if (OrderInfo.SellFormEmp == 1)
{
OrderInfo.SellFormEmp = userInfo.EmployeeId;
}
if (!string.IsNullOrEmpty(userInfo.ActionMenuCode) && ("," + userInfo.ActionMenuCode + ",").Contains(",S_CheckAllOrder,"))
{
if (OrderInfo.RB_Department_Id > 0)
{
OrderInfo.DepartmentIds = sellOrderModule.GetDepartments(OrderInfo.RB_Department_Id ?? 0);
}
}
else
{
if (OrderInfo.RB_Department_Id > 0)
{
//HK修改
OrderInfo.DepartmentIds = sellOrderModule.GetDepartments(Convert.ToInt32(OrderInfo.RB_Department_Id));
}
else
{
if (!string.IsNullOrEmpty(userInfo.ActionMenuCode) && ("," + userInfo.ActionMenuCode + ",").Contains(",S_CheckBranchOrder,"))
{
string departStr = sellOrderModule.GetDepartmentsForBranchId(userInfo.RB_Branch_id);
//查询二级公司部门
var blist = branchModule.GetTwoBranchList(userInfo.RB_Branch_id, userInfo.RB_Group_id);
if (blist.Any())
{
foreach (var ritem in blist)
{
var emodel = CacheManager.User.RbUserCache.GetEmployee(ritem.BranchManager);
if (emodel != null)
{
string depStr = sellOrderModule.GetDepartments(emodel.RB_Department_Id);
if (!string.IsNullOrEmpty(depStr))
{
departStr += "," + depStr;
}
}
}
}
//验证员工是否在
if ((OrderInfo.CreateBy ?? 0) > 0)
{
var cmodel = CacheManager.User.RbUserCache.GetEmployee(OrderInfo.CreateBy);
if (!("," + departStr + ",").Contains("," + cmodel?.RB_Department_Id + ","))
{
return ApiResult.Failed("没有权限查询该员工订单");
}
}
else
{
OrderInfo.DepartmentIds = departStr;
}
}
else if (!string.IsNullOrEmpty(userInfo.ActionMenuCode) && ("," + userInfo.ActionMenuCode + ",").Contains(",S_CheckDepartmentOrder,"))
{
string departStr = sellOrderModule.GetDepartments(userInfo.RB_Department_Id);
//验证员工是否在
if ((OrderInfo.CreateBy ?? 0) > 0)
{
var cmodel = CacheManager.User.RbUserCache.GetEmployee(OrderInfo.CreateBy);
if (!("," + departStr + ",").Contains("," + cmodel?.RB_Department_Id + ","))
{
return ApiResult.Failed("没有权限查询该员工订单");
}
}
else
{
OrderInfo.DepartmentIds = departStr;
}
}
else
{
OrderInfo.CreateBy = userInfo.EmployeeId;
}
}
}
}
OrderInfo.RB_Group_Id = userInfo.RB_Group_id;
OrderInfo.OutBranchId = -1;
OrderInfo.Sort = 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment