Commit 38bcce62 authored by liudong1993's avatar liudong1993

修改积分赠送 不含运费

parent e8893d42
...@@ -3482,7 +3482,7 @@ namespace Mall.Module.Product ...@@ -3482,7 +3482,7 @@ namespace Mall.Module.Product
{ {
if (item.IntegralPresentType == 1) if (item.IntegralPresentType == 1)
{ {
IntegralPresent = Convert.ToInt32(((item.Final_Price ?? 0) + (item.FreightMoney ?? 0)) * (item.IntegralPresent ?? 0) / 100); IntegralPresent = Convert.ToInt32((item.Final_Price ?? 0) * (item.IntegralPresent ?? 0) / 100);
} }
} }
//插入订单明细表 //插入订单明细表
...@@ -3848,7 +3848,7 @@ namespace Mall.Module.Product ...@@ -3848,7 +3848,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 ?? 0) - (dModel.FreightMoney ?? 0)) < demodel.Refund) if (demodel.Type == 1 && (dModel.Final_Price ?? 0) < demodel.Refund)
{ {
return false; return false;
} }
......
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