Commit 69f1b14b authored by liudong1993's avatar liudong1993

1

parent ec9c53de
...@@ -1174,12 +1174,12 @@ LIMIT 100 "; ...@@ -1174,12 +1174,12 @@ LIMIT 100 ";
{ {
orderTypeWhere += $@" and {nameof(RB_Goods_OrderDetail.OrderType)}={dmodel.OrderType}"; orderTypeWhere += $@" and {nameof(RB_Goods_OrderDetail.OrderType)}={dmodel.OrderType}";
} }
if (dmodel.OrderStatus == 0) if (dmodel.OrderStatus == 1)
{ {
where += $" 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' ) ) )"; where += $" 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' ) ) )";
payMemerNumWhere = $"and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) "; payMemerNumWhere = $"and (OrderStatus in(2,3,4,5,6) or (OrderStatus=7 and PaymentTime is not NULL and CancelTime is not NULL and DATE_FORMAT(PaymentTime,'%Y-%m-%d' )<DATE_FORMAT(CancelTime,'%Y-%m-%d' ) ) ) ";
} }
else if (dmodel.OrderStatus == 1) else if (dmodel.OrderStatus == 0)
{ {
where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,5,6)"; where += $@" and a.{nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,5,6)";
payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,5,6)"; payMemerNumWhere += $@" and {nameof(RB_Goods_Order.OrderStatus)} in(2,3,4,5,6)";
......
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