Commit c8687e04 authored by 吴春's avatar 吴春

1

parent a7946a22
...@@ -5000,7 +5000,6 @@ namespace REBORN.Services.SellService ...@@ -5000,7 +5000,6 @@ namespace REBORN.Services.SellService
} }
else else
{ {
https://servicewechat.com/wx76f943d5111a0e76/70/image/yunfuyoukang/bg_top1.png
userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid); userInfo = CacheManager.User.RbUserCache.GetUserLoginInfo(request.uid);
} }
if (userInfo.SimpleEasy == 0) if (userInfo.SimpleEasy == 0)
...@@ -6610,7 +6609,11 @@ namespace REBORN.Services.SellService ...@@ -6610,7 +6609,11 @@ namespace REBORN.Services.SellService
RB_Group_id = userInfo.RB_Group_id, RB_Group_id = userInfo.RB_Group_id,
RB_Department_Id = userInfo.RB_Department_Id, RB_Department_Id = userInfo.RB_Department_Id,
}; };
var addSupplier = supplierModule.Set(supplierModel, out int supplierId); int supplierId = -1;
if (!string.IsNullOrWhiteSpace(supplierModel.Name) && !string.IsNullOrWhiteSpace(supplierModel.Contact) && !string.IsNullOrWhiteSpace(supplierModel.Tel))
{
var addSupplier = supplierModule.Set(supplierModel, out supplierId);
}
newpriceModel.YSeat = (dmodel.GuestNum ?? 0) - (dmodel.BabyNum ?? 0); newpriceModel.YSeat = (dmodel.GuestNum ?? 0) - (dmodel.BabyNum ?? 0);
newpriceModel.SupplierId = supplierId; newpriceModel.SupplierId = supplierId;
newpriceModel.WordPath = dmodel.WordPath; newpriceModel.WordPath = dmodel.WordPath;
...@@ -6662,9 +6665,7 @@ namespace REBORN.Services.SellService ...@@ -6662,9 +6665,7 @@ namespace REBORN.Services.SellService
decimal Commission = Math.Round((dmodel.PreferPrice ?? 0) * Convert.ToDecimal(0.01) + ExtraCommission, 2, MidpointRounding.AwayFromZero); decimal Commission = Math.Round((dmodel.PreferPrice ?? 0) * Convert.ToDecimal(0.01) + ExtraCommission, 2, MidpointRounding.AwayFromZero);
#region 组装团信息 #region 组装团信息
//供应商信息(供应商名称、联系人、联系电话是必须的,营业执照号、开户信息非必填)) //供应商信息(供应商名称、联系人、联系电话是必须的,营业执照号、开户信息非必填))
int supplierId = parms.GetInt("supplierId");
if (supplierId != -1)
{
RB_Supplier supplierModel = new RB_Supplier //供应商id RB_Supplier supplierModel = new RB_Supplier //供应商id
{ {
ID = parms.GetInt("SupplierId"), ID = parms.GetInt("SupplierId"),
...@@ -6682,9 +6683,11 @@ namespace REBORN.Services.SellService ...@@ -6682,9 +6683,11 @@ namespace REBORN.Services.SellService
RB_Group_id = userInfo.RB_Group_id, RB_Group_id = userInfo.RB_Group_id,
RB_Department_Id = userInfo.RB_Department_Id, RB_Department_Id = userInfo.RB_Department_Id,
}; };
int supplierId = -1;
if (!string.IsNullOrWhiteSpace(supplierModel.Name) && !string.IsNullOrWhiteSpace(supplierModel.Contact) && !string.IsNullOrWhiteSpace(supplierModel.Tel))
{
var addSupplier = supplierModule.Set(supplierModel, out supplierId); var addSupplier = supplierModule.Set(supplierModel, out supplierId);
} }
RB_Travel_Config_Extend modelConfig = new RB_Travel_Config_Extend RB_Travel_Config_Extend modelConfig = new RB_Travel_Config_Extend
{ {
ArriveCityId = 0, ArriveCityId = 0,
......
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