Skip to content

H
huatu_API
Commit 96f4e2dd authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents b65731fe 6de60969
Hide whitespace changes
Inline Side-by-side
Showing with 86 additions and 71 deletions
REBORN.Module.SellModule/CustomerOrderModule.cs
View file @ 96f4e2dd
...@@ -3744,91 +3744,104 @@ namespace REBORN.Module.SellModule ...@@ -3744,91 +3744,104 @@ namespace REBORN.Module.SellModule
} }
else else
{ {
demodel.CouponsId = hotel.ID; try
#region 组装详情信息 {
//demodel.DetailList = new List<RB_Customer_TicketOrderDetail_Extend>(); demodel.CouponsId = hotel.ID;
//RB_Customer_TicketOrderDetail_Extend ticketOrderDetailModel = new RB_Customer_TicketOrderDetail_Extend #region 组装详情信息
//{ //demodel.DetailList = new List<RB_Customer_TicketOrderDetail_Extend>();
// Id = 0, //RB_Customer_TicketOrderDetail_Extend ticketOrderDetailModel = new RB_Customer_TicketOrderDetail_Extend
// OrderId = 0, //{
// TicketName = product.TicketName, // Id = 0,
// Unit_Price = demodel.PeopleNum == 0 ? demodel.Money : Math.Round(demodel.Money / (demodel?.PeopleNum ?? 1), 2), // OrderId = 0,
// Num = demodel.PeopleNum, // TicketName = product.TicketName,
// Money = demodel.Money, // Unit_Price = demodel.PeopleNum == 0 ? demodel.Money : Math.Round(demodel.Money / (demodel?.PeopleNum ?? 1), 2),
// CurrencyId = 1, // Num = demodel.PeopleNum,
// CurrentRate = 1, // Money = demodel.Money,
// TicketId = product.Id, // CurrencyId = 1,
// PriceId = 0, // CurrentRate = 1,
// Status = 0, // TicketId = product.Id,
//}; // PriceId = 0,
//demodel.DetailList.Add(ticketOrderDetailModel); // Status = 0,
//};
//demodel.DetailList.Add(ticketOrderDetailModel);
#endregion #endregion
demodel.OpEmpId = ticketCoupons_TicketRepository.GetEntity(demodel.CouponsId)?.UpdateBy ?? 0;//2023.04.14 add by:W 下单的时候 先默认 产品的创建人 为OP； demodel.OpEmpId = ticketCoupons_TicketRepository.GetEntity(demodel.CouponsId)?.UpdateBy ?? 0;//2023.04.14 add by:W 下单的时候 先默认 产品的创建人 为OP；
demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + new Random().Next(1111, 9999); demodel.OrderNo = DateTime.Now.ToString("yyyyMMddHHmmssfff") + new Random().Next(1111, 9999);
// demodel.OrderStatus = CustomerOrderStatusEnum.Confirm;//ld 2023-03-08 修改门票预定逻辑，只要创建订单，直接变为已确认状态 // demodel.OrderStatus = CustomerOrderStatusEnum.Confirm;//ld 2023-03-08 修改门票预定逻辑，只要创建订单，直接变为已确认状态
orderId = customer_TicketOrderRepository.Insert(demodel); orderId = customer_TicketOrderRepository.Insert(demodel);
demodel.OrderId = orderId; demodel.OrderId = orderId;
if (orderId > 0) if (orderId > 0)
{
foreach (var item in demodel.DetailList)
{
item.OrderId = orderId;
item.TicketId = product.Id;
item.Unit_Price = Math.Round(item.Money / (item?.Num ?? 1), 2);
bool flagD = customer_TicketOrderDetailRepository.Insert(item) > 0;
}
if (!string.IsNullOrEmpty(demodel.DiscountsIds))
{ {
int affectNum = coupon_AllotRepository.UserUseCouponAllotForB2C(orderId, Common.Enum.Dmc.DirectGoodsTypeEnum.AttractionTickets, demodel.DiscountsIds); try
if (affectNum <= 0)
{ {
LogHelper.Write("B2C用户下单 门票，优惠券使用失败！OrderId:" + orderId + "，优惠券ID" + demodel.DiscountsIds); foreach (var item in demodel.DetailList)
{
item.OrderId = orderId;
item.TicketId = product.Id;
item.Unit_Price = Math.Round(item.Money / (item?.Num ?? 1), 2);
bool flagD = customer_TicketOrderDetailRepository.Insert(item) > 0;
}
}
catch (Exception ex)
{
flag = false;
} }
}
//记录订单日志
customer_OrderLogRepository.Insert(new RB_Customer_OrderLog()
{
LogId = 0,
GroupId = demodel.GroupId,
CreateBy = demodel.EnterID,
CreateTime = DateTime.Now,
LogContent = "创建订单",
OrderId = orderId,
Type = 2
});
#region 推送企微机器人消息 if (!string.IsNullOrEmpty(demodel.DiscountsIds))
{
int affectNum = coupon_AllotRepository.UserUseCouponAllotForB2C(orderId, Common.Enum.Dmc.DirectGoodsTypeEnum.AttractionTickets, demodel.DiscountsIds);
if (affectNum <= 0)
{
LogHelper.Write("B2C用户下单 门票，优惠券使用失败！OrderId:" + orderId + "，优惠券ID" + demodel.DiscountsIds);
}
}
//记录订单日志
customer_OrderLogRepository.Insert(new RB_Customer_OrderLog()
{
LogId = 0,
GroupId = demodel.GroupId,
CreateBy = demodel.EnterID,
CreateTime = DateTime.Now,
LogContent = "创建订单",
OrderId = orderId,
Type = 2
});
if (userInfo.SimpleEasy == 1) #region 推送企微机器人消息
{ if (userInfo.SimpleEasy == 1)
string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? ""; {
string jdName = ticketCouponsRepository.GetEntity(demodel.CouponsId)?.Name ?? "";
//新增订单，推送消息 //新增订单，推送消息
Dictionary<string, string> dic = new Dictionary<string, string> Dictionary<string, string> dic = new Dictionary<string, string>
{ {
{ "订单类型", "邮轮产品" }, { "订单类型", "邮轮产品" },
{ "订单编号", demodel.OrderNo.ToString() }, { "订单编号", demodel.OrderNo.ToString() },
{ "产品名称", jdName }, { "产品名称", jdName },
{ "销售人员", userInfo.emName } { "销售人员", userInfo.emName }
}; };
//新增订单，推送消息
try
{
//新增订单，推送消息 //新增订单，推送消息
messagePushConfigModule.MessagePushSend(userInfo.RB_Group_id, dic, MessagePushSendType.NewOrder); try
} {
catch (Exception ex) //新增订单，推送消息
{ messagePushConfigModule.MessagePushSend(userInfo.RB_Group_id, dic, MessagePushSendType.NewOrder);
LogHelper.Error("推送机器人消息失败", ex); }
catch (Exception ex)
{
LogHelper.Error("推送机器人消息失败", ex);
}
} }
#endregion
} }
#endregion flag = orderId > 0;
}
catch (Exception ex)
{
flag = false;
} }
flag = orderId > 0;
} }
if (flag) if (flag)
{ {
......
REBORN.Services.SellService/CustomerOrderService.cs
View file @ 96f4e2dd
...@@ -2378,13 +2378,13 @@ namespace REBORN.Services.SellService ...@@ -2378,13 +2378,13 @@ namespace REBORN.Services.SellService
Common.Plugin.LogHelper.Write(ex, "SetTeavelTeam"); Common.Plugin.LogHelper.Write(ex, "SetTeavelTeam");
} }
} }
if ((orderGuestList?.Count) == 0) if ((DetailList?.Count) == 0)
{ {
// return ApiResult.ParamIsNull("请填写入住人员名单"); return ApiResult.ParamIsNull("请选择房间类型");
} }
else else
{ {
query.GuestInfo = JsonConvert.SerializeObject(orderGuestList); query.DetailList = DetailList;
} }
RB_TicketCoupons_Ticket ticket = new RB_TicketCoupons_Ticket RB_TicketCoupons_Ticket ticket = new RB_TicketCoupons_Ticket
{ {
...@@ -3351,7 +3351,8 @@ namespace REBORN.Services.SellService ...@@ -3351,7 +3351,8 @@ namespace REBORN.Services.SellService
// y.PassportNo, // y.PassportNo,
// y.Tel // y.Tel
//}), //}),
OtherContractList = x.OtherContractList?.Select(z=> new { OtherContractList = x.OtherContractList?.Select(z => new
{
z.ID, z.ID,
z.T_ContractNum, z.T_ContractNum,
z.CType, z.CType,
...@@ -3752,7 +3753,8 @@ namespace REBORN.Services.SellService ...@@ -3752,7 +3753,8 @@ namespace REBORN.Services.SellService
{ {
demodel.EnterID = userInfo.EmployeeId;//可以设置销售 demodel.EnterID = userInfo.EmployeeId;//可以设置销售
} }
else { else
{
//查询一下 公司别 //查询一下 公司别
demodel.EmpBranchId = CacheManager.User.RbUserCache.GetUserLoginInfo(demodel.EnterID.ToString())?.RB_Branch_id; demodel.EmpBranchId = CacheManager.User.RbUserCache.GetUserLoginInfo(demodel.EnterID.ToString())?.RB_Branch_id;
} }
......
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