Skip to content

M
mall.oytour.com
Commit 09fbf258 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com into sdzq

parents 5b70c847 fca629f7
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 11 deletions
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @ 09fbf258
......@@ -326,5 +326,13 @@ namespace Mall.Model.Entity.Product
/// 线路名称
/// </summary>
public string LineName { get; set; }
/// <summary>
/// 保险价格
/// </summary>
public decimal? InsuranceMoney { get; set; }
/// <summary>
/// 保险成本价格
/// </summary>
public decimal? InsuranceCostMoney { get; set; }
}
}
Mall.Module.Product/GuideCarModule.cs
View file @ 09fbf258
......@@ -1828,10 +1828,12 @@ namespace Mall.Module.Product
decimal Total_integral_price = 0;//总积分金额
int Total_use_integral = 0;//总积分
decimal CouponsMoney = 0;//优惠总金额
decimal InsuranceMoney = 0;//保险金额
bool IsPointsDeduction = false;//是否有商品可使用积分抵扣
bool address_enable = true;//地址Ok
bool date_enable = true;//日期ok
List<object> goods_list = new List<object>();
var guidebaseModel = guideCar_BaseRepository.GetList(new RB_GuideCar_Base_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
if (demodel.DetailList.Any())
{
string GoodsIds = string.Join(",", demodel.DetailList.Select(x => x.GoodsId));
......@@ -2304,12 +2306,6 @@ namespace Mall.Module.Product
}
#region 司导信息
//string SiteName = sitelist.Where(x => x.ID == gmodel.SiteId).FirstOrDefault()?.SiteName ?? "";
//string GuideName = guidelist.Where(x => x.ID == gmodel.GuideId).FirstOrDefault()?.Name ?? "";
//decimal GuideScore = guidelist.Where(x => x.ID == gmodel.GuideId).FirstOrDefault()?.Score ?? 5;
//string CarName = carlist.Where(x => x.ID == gmodel.CarId).FirstOrDefault()?.Name ?? "";
//decimal CarScore = carlist.Where(x => x.ID == gmodel.CarId).FirstOrDefault()?.Score ?? 5;
//string CarColorName = carcolorlist.Where(x => x.ID == gmodel.CarColorId).FirstOrDefault()?.ColorName ?? "";
var targetList = goods_TargetDateRepository.GetList(new RB_Goods_TargetDate_Extend() { GoodsId = gmodel.Id, IsReserve = 1, DateTime = demodel.TripSTime.Value.ToString("yyyy-MM-dd") });
if (gmodel.AdvanceDay > 0)
{
......@@ -2339,6 +2335,10 @@ namespace Mall.Module.Product
decimal CarScore = carModel?.Score ?? 5;
string CarModel = carModel?.CarType ?? "";
//保险
decimal qInsuranceMoney = guidebaseModel?.SalePrice ?? 0;
decimal qInsuranceCostMoney = guidebaseModel?.CostPrice ?? 0;
InsuranceMoney += qInsuranceMoney;
#endregion
goods_list.Add(new
{
......@@ -2369,6 +2369,8 @@ namespace Mall.Module.Product
integral_price = demodel.Use_Integral == 1 ? item.IntegralMoney : 0,//积分抵扣金额
use_integral = demodel.Use_Integral == 1 ? item.IntegralNumber : 0,
couponMoney,
insurance_money = qInsuranceMoney,
insurance_costmoney = qInsuranceCostMoney,
name = gmodel.Name,
cover_pic = gmodel.CoverImage,
detail = gmodel.GoodsDetails,
......@@ -2467,7 +2469,8 @@ namespace Mall.Module.Product
user_coupon_id = demodel.User_Coupon_Id ?? 0
},
integral = IntegralObj,
total_price = TotalGoodsMoney,
insurance_money = InsuranceMoney,
total_price = TotalGoodsMoney + InsuranceMoney,
});
//订阅
......@@ -2491,8 +2494,9 @@ namespace Mall.Module.Product
{
mch_list,
promptNoSuperiorFY = PromptNoSuperiorFY,
total_price = TotalGoodsMoney,
total_price = TotalGoodsMoney + InsuranceMoney,
date_enable,
insurance_description = guidebaseModel?.InsuranceDescription,
address = new
{
demodel.District,
......
Mall.Module.Product/OrderModule.cs
View file @ 09fbf258
......@@ -3786,6 +3786,7 @@ namespace Mall.Module.Product
decimal TotalIntegralMoney = 0;//总使用积分抵扣金额
List<RB_Goods_CouponModel> GoodsCouponList = new List<RB_Goods_CouponModel>();//商品优惠卷 价格（每个商品优惠的价格）
decimal CouponsMoney = 0;//优惠卷验证
decimal InsuranceMoney = 0;//保险金额
#region 优惠卷初始化
List<RB_Member_DiscountCoupon_Extend> cList = new List<RB_Member_DiscountCoupon_Extend>();
List<Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend> dcList = new List<Model.Extend.MarketingCenter.RB_DiscountCoupon_Extend>();
......@@ -3838,6 +3839,7 @@ namespace Mall.Module.Product
var clist = goods_CategoryRepository.GetList(new RB_Goods_Category_Extend() { GoodsIds = GoodsIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
var mpriceList = goods_MemberPriceRepository.GetList(new RB_Goods_MemberPrice_Extend() { GoodsIds = GoodsIds, TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId });
var mallbaseModel = mallBaseRepository.GetListRepository(new Model.Extend.BaseSetUp.RB_MallBase_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
var guidebaseModel = guideCar_BaseRepository.GetList(new Model.Extend.GuideCar.RB_GuideCar_Base_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
#region 微店价格
RB_SmallShops_Info_Extend smallModel = new RB_SmallShops_Info_Extend();
......@@ -4276,6 +4278,9 @@ namespace Mall.Module.Product
}
item.FreightMoney = 0;
item.InsuranceMoney = guidebaseModel?.SalePrice ?? 0;
item.InsuranceCostMoney = guidebaseModel?.CostPrice ?? 0;
InsuranceMoney += (item.InsuranceMoney ?? 0);
}
}
if (CouponsMoney != demodel.CouponMoney)
......@@ -4283,11 +4288,11 @@ namespace Mall.Module.Product
return ApiResult.Failed("优惠金额计算有误");
}
//验证总额
if (demodel.Income != TotalMoney)
if (demodel.Income != TotalMoney + InsuranceMoney)
{
return ApiResult.Failed("订单合计金额不正确");
}
demodel.PreferPrice = TotalMoney + CouponsMoney;
demodel.PreferPrice = TotalMoney + CouponsMoney + InsuranceMoney;
#region 手续费计算
decimal ServiceCharge = Convert.ToDecimal(Config.SettlementRate) / 100;
......@@ -5868,7 +5873,9 @@ namespace Mall.Module.Product
IsSpell = item.IsSpell,
TripETime = item.TripETime,
TripSTime = item.TripSTime,
UseDay = item.UseDay
UseDay = item.UseDay,
InsuranceMoney = item.InsuranceMoney,
InsuranceCostMoney = item.InsuranceCostMoney
}, trans);
item.Id = detailId;
if (detailId > 0 && SatisfiedGoodsList.Any())
......
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