Commit 06abd1b5 authored by liudong1993's avatar liudong1993

费用调整

parent a70a149b
...@@ -171,5 +171,9 @@ namespace Mall.Model.Entity.Product ...@@ -171,5 +171,9 @@ namespace Mall.Model.Entity.Product
/// 是否评论 1是 2否 /// 是否评论 1是 2否
/// </summary> /// </summary>
public int? IsComment { get; set; } public int? IsComment { get; set; }
/// <summary>
/// 运费
/// </summary>
public decimal? FreightMoney { get; set; }
} }
} }
...@@ -623,7 +623,8 @@ namespace Mall.Module.Product ...@@ -623,7 +623,8 @@ namespace Mall.Module.Product
dModel.GoodsName, dModel.GoodsName,
SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification), SpecificationList = JsonConvert.DeserializeObject<List<string>>(dModel.Specification),
dModel.Number, dModel.Number,
dModel.Final_Price dModel.Final_Price,
dModel.FreightMoney
}); });
} }
...@@ -1309,6 +1310,7 @@ namespace Mall.Module.Product ...@@ -1309,6 +1310,7 @@ namespace Mall.Module.Product
} }
} }
TotalExpress += Express; TotalExpress += Express;
item.FreightMoney = Express;
item.Unit_Price = gmodel.SellingPrice ?? 0; item.Unit_Price = gmodel.SellingPrice ?? 0;
item.Original_Price = (item.Unit_Price) * (item.Number); item.Original_Price = (item.Unit_Price) * (item.Number);
if (umodel.MemberGrade > 0) if (umodel.MemberGrade > 0)
...@@ -1912,7 +1914,8 @@ namespace Mall.Module.Product ...@@ -1912,7 +1914,8 @@ namespace Mall.Module.Product
Unit_Price = item.Unit_Price, Unit_Price = item.Unit_Price,
TenantId = demodel.TenantId, TenantId = demodel.TenantId,
UpdateDate = DateTime.Now, UpdateDate = DateTime.Now,
IsComment = 2 IsComment = 2,
FreightMoney = item.FreightMoney
}, trans); }, trans);
item.Id = detailId; item.Id = detailId;
//更新商品数量 //更新商品数量
...@@ -2154,7 +2157,7 @@ namespace Mall.Module.Product ...@@ -2154,7 +2157,7 @@ namespace Mall.Module.Product
public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel) public bool SetAppletMyOrderAfterSale(RB_Goods_OrderAfterSale_Extend demodel)
{ {
var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId); var dModel = goods_OrderDetailRepository.GetEntity(demodel.OrderDetialId);
if (demodel.Type==1 && dModel.Final_Price < demodel.Refund) { if (demodel.Type==1 && ((dModel.Final_Price??0)-(dModel.FreightMoney??0)) < demodel.Refund) {
return false; return false;
} }
demodel.Income = dModel.Final_Price; demodel.Income = dModel.Final_Price;
......
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