调整留学提成

Edu.Module.Course/SellCommissionModule.cs

@@ -2959,26 +2959,19 @@ namespace Edu.Module.Course
                     var ruleModel = rulelist.Where(x => x.OrderType == (int)item.OrderNature).FirstOrDefault();
                     if (ruleModel == null) { continue; }
 
+                    var flist = financeList.Where(x => x.OrderID == item.OrderId).ToList();
                     decimal TotalMoney = 0;//销售额/利润
                     if (ruleModel.CommissionType == 1)
                     {
                         //销售额
                         decimal XSEMoney = item.Income + item.PlatformTax;
-                        if (financeList.Where(x => x.OtherType == 45).Any())
-                        {
-                            //有成本单据
-                            XSEMoney -= financeList.Where(x => x.OtherType != 45).Sum(x => x.Money ?? 0);//排除成本的
-                        }
-                        else
-                        {
-                            XSEMoney -= item.Refund;
-                        }
+                        XSEMoney -= flist.Where(x => x.OtherType != 45).Sum(x => x.Money ?? 0);//排除成本的
                         TotalMoney = XSEMoney;
                     }
                     else
                     {
                         //利润
-                        decimal LRMoney = item.Income + item.PlatformTax - item.Refund;//利润有减成本的
+                        decimal LRMoney = item.Income - flist.Sum(x => x.Money ?? 0);//利润=实收减成本退款的
                         TotalMoney = LRMoney;
                     }