Skip to content

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

提交

parent f89c869e
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 19 deletions
Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs
View file @ 71d4d52f
......@@ -152,17 +152,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
foreach (var item in list)
{
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
}
item.ALLCommission = item.ServiceCharge + item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
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;
......@@ -370,16 +365,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
foreach (var item in list)
{
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
}
item.ALLCommission = item.ServiceCharge + item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
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;
......@@ -577,16 +568,13 @@ namespace Mall.WebApi.Controllers.AppletWeChat
foreach (var item in list)
{
if (item.OrderStatus == 7)
{
item.RefundActual = item.RefundActual - item.ServiceCharge;
}
item.ALLCommission = item.ServiceCharge + item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
item.NoPaid = item.ALLCommission;
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