Skip to content

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

提交diam

parent f6673e02
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
Mall.Repository/Product/RB_SmallShops_CommissionRepository.cs
View file @ 5adcb40f
...@@ -37,7 +37,7 @@ namespace Mall.Repository.Product ...@@ -37,7 +37,7 @@ namespace Mall.Repository.Product
{ {
where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderId)}={dmodel.OrderId}"; where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderId)}={dmodel.OrderId}";
} }
if (dmodel.OrderDetailId > 0) if (dmodel.OrderDetailId > 0)
{ {
where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderDetailId)}={dmodel.OrderDetailId}"; where += $@" and oc.{nameof(RB_SmallShops_Commission.OrderDetailId)}={dmodel.OrderDetailId}";
} }
...@@ -183,7 +183,7 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type order by oc.OrderI ...@@ -183,7 +183,7 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Type order by oc.OrderI
string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc
INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null"; WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null and oc.type=1 ";
var obj = ExecuteScalar(sql); var obj = ExecuteScalar(sql);
if (obj != null) if (obj != null)
...@@ -204,7 +204,7 @@ left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and o ...@@ -204,7 +204,7 @@ left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and o
string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc string sql = $@"SELECT SUM(Commission) as Commission FROM RB_SmallShops_Commission oc
INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5) left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
WHERE oc.UserId={userId} and oc.CommissionState=1 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null"; WHERE oc.UserId={userId} and oc.CommissionState=1 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null and oc.type=1 ";
var obj = ExecuteScalar(sql); var obj = ExecuteScalar(sql);
if (obj != null) if (obj != null)
......
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