Skip to content

E
Education
Commit d3c9ed88 authored by liudong1993's avatar liudong1993
Browse files
Options

订单 平台税金加上

parent b701529a
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
Edu.Repository/Course/RB_OrderRepository.cs
View file @ d3c9ed88
......@@ -177,7 +177,7 @@ where {where} order by {orderBy}
}
if (demodel.Q_NotCollect == 1)
{
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
}
string orderBy = " o.OrderId asc";
......@@ -268,7 +268,7 @@ where {where} order by {orderBy}
}
if (demodel.Q_NotCollect == 1)
{
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
where += $@" and o.{nameof(RB_Order_ViewModel.PreferPrice)} > (o.{nameof(RB_Order_ViewModel.Income)} - o.{nameof(RB_Order_ViewModel.Refund)} + o.{nameof(RB_Order_ViewModel.PlatformTax)} + o.{nameof(RB_Order_ViewModel.DiscountMoney)}) ";
}
string sql = $@" select SUM(CASE WHEN o.OrderState <> 3 THEN o.PreferPrice ELSE 0 END) AS PreferPrice,
......
Edu.WebApi/Controllers/Course/OrderController.cs
View file @ d3c9ed88
......@@ -118,7 +118,8 @@ namespace Edu.WebApi.Controllers.Course
x.Income,
x.Refund,
x.DiscountMoney,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.DiscountMoney),
x.PlatformTax,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.PlatformTax + x.DiscountMoney),
x.OrderState,
OrderStateName = x.OrderState.ToName(),
x.EnterID,
......@@ -748,7 +749,8 @@ namespace Edu.WebApi.Controllers.Course
x.Income,
x.Refund,
x.DiscountMoney,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.DiscountMoney),
x.PlatformTax,
DueInMoney = x.PreferPrice - (x.Income - x.Refund + x.PlatformTax + x.DiscountMoney),
x.OrderState,
OrderStateName = x.OrderState.ToName(),
x.EnterID,
......
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