Commit 68a2855f authored by liudong1993's avatar liudong1993

1

parent 393a6596
...@@ -503,7 +503,7 @@ namespace Edu.Module.Course ...@@ -503,7 +503,7 @@ namespace Edu.Module.Course
#endregion #endregion
var classModel = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault(); var classModel = clist.Where(x => x.ClassId == item.ClassId).FirstOrDefault();
if (classModel == null) { break; } if (classModel == null) { continue; }
int EnrollType = item.RenewOrderId > 0 ? 2 : 1; int EnrollType = item.RenewOrderId > 0 ? 2 : 1;
var ruleModel = rulelist.Where(x => x.ClassType == classModel.ClassType && x.EnrollType == EnrollType).FirstOrDefault();//该订单适用规则 var ruleModel = rulelist.Where(x => x.ClassType == classModel.ClassType && x.EnrollType == EnrollType).FirstOrDefault();//该订单适用规则
...@@ -546,7 +546,7 @@ namespace Edu.Module.Course ...@@ -546,7 +546,7 @@ namespace Edu.Module.Course
if (YFCommission == 0 && ClassCommissioned == 0) if (YFCommission == 0 && ClassCommissioned == 0)
{ {
break; continue;
} }
#endregion #endregion
......
...@@ -669,7 +669,7 @@ GROUP BY ClassId;"; ...@@ -669,7 +669,7 @@ GROUP BY ClassId;";
} }
string sql = $@"SELECT o.* FROM rb_order o string sql = $@"SELECT o.* FROM rb_order o
inner join rb_class c on o.ClassId = c.ClassId inner join rb_class c on o.ClassId = c.ClassId
WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.EffectStatus in(1,2) and o.CommissionRate >0 and o.CreateTime <'{enableDate}' and c.OpenTime <= '{eDate} 23:59:59' {where} and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) and (o.IsCommissionGiveOK =0 or (o.ExtraRewardMoney -o.ExtraDeductMoney)<> o.ExtraCommissionMoney);"; WHERE o.Group_Id ={group_Id} and o.OrderState =1 and o.EffectStatus in(1,2) and o.CommissionRate >0 and o.Income >0 and o.CreateTime <'{enableDate}' and c.OpenTime <= '{eDate} 23:59:59' {where} and o.PreferPrice = (o.Income - o.Refund + o.DiscountMoney + o.PlatformTax) and (o.IsCommissionGiveOK =0 or (o.ExtraRewardMoney -o.ExtraDeductMoney)<> o.ExtraCommissionMoney);";
return Get<RB_Order_ViewModel>(sql).ToList(); return Get<RB_Order_ViewModel>(sql).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