Commit f89c869e authored by 吴春's avatar 吴春

提交代码

parent 6d1f50b5
......@@ -152,7 +152,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
foreach (var item in list)
{
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
......@@ -162,7 +162,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.ServiceCharge + item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
item.GrossProfit = item.AllPrice + item.YSMoney - item.ALLCommission;
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.AllPrice == 0)
{
item.GrossProfitRate = 0;
......@@ -369,7 +369,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
}
foreach (var item in list)
{
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
......@@ -379,6 +379,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.ServiceCharge + item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
item.GrossProfit = item.AllPrice + item.YSMoney - item.ALLCommission;
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.AllPrice == 0)
{
item.GrossProfitRate = 0;
......@@ -575,7 +576,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
}
foreach (var item in list)
{
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
......@@ -585,6 +586,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
item.Paid = item.ServiceCharge + item.RefundActual + item.RemitFXCommission + item.CostMoney + item.GoodsFreight + item.PayMoney;
item.GrossProfit = item.AllPrice + item.YSMoney - item.ALLCommission;
item.AllPrice = item.AllPrice - item.ServiceCharge;
if (item.AllPrice == 0)
{
item.GrossProfitRate = 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