Commit 0f091897 authored by 黄奎's avatar 黄奎

页面修改

parent e6c8625b
......@@ -1378,12 +1378,14 @@ GROUP BY od.GoodsId,o.OrderId
public List<OrderStatistics_Query> GetFXOrderProfitLossList(int pageIndex, int pageSize, out long count, OrderStatistics_Query dmodel)
{
// string where = "where 1=1 and a.OrderStatus in(2,3,4,5,6) ";
DynamicParameters parameters = new DynamicParameters();
string where = "where 1=1 and (a.OrderStatus in(2,3,4,5,6) or (a.OrderStatus=7 and a.PaymentTime is not NULL and a.CancelTime is not NULL and DATE_FORMAT(a.PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(a.CancelTime,'%Y-%m-%d' ) ) ) ";
if (dmodel != null)
{
if (!string.IsNullOrWhiteSpace(dmodel.OrderNo))
{
where += $" and a.OrderNo like'%{dmodel.OrderNo}%'";
where += $" and a.OrderNo like @OrderNo ";
parameters.Add("OrderNo", "%" + dmodel.OrderNo.Trim() + "%");
}
if (dmodel.TenantId > 0)
{
......@@ -1446,7 +1448,7 @@ LEFT JOIN rb_member_user as muser on muser.id=b.CompanyId
left join rb_goods_orderaftersale oa on b.ID= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) {where}
GROUP BY b.Id order by b.Id asc";
return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql).ToList();
return GetPage<OrderStatistics_Query>(pageIndex, pageSize, out count, sql, parameters).ToList();
}
......
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