1

REBORN.Module.CommissionModule/MergeCommissionModule2.cs

@@ -1614,7 +1614,7 @@ namespace REBORN.Module.CommissionModule
                                             HTCProfit = reportList.Any() ? reportList.Sum(x => (x.ShiJiLiRun ?? 0) + (x.TiCheng ?? 0) - (x.YongJinShouRu ?? 0) - x.LeaderPeopleMoney + x.EuropeShareProfit - (x.ZiFei ?? 0)) : 0;
                                         }
                                         //查询该订单的利润
-                                        if (hisOrder.TCProfit != HTCProfit)
+                                        if (hisOrder.TCProfit != HTCProfit && HTCProfit>0)
                                         {
                                             if (hisOrder.PeopleNum <= 0)
                                             {
@@ -1702,12 +1702,15 @@ namespace REBORN.Module.CommissionModule
                                     udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
                                     udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
                                     udmodel.Periods = month;
+                                    if (udmodel.CommissionMoney != 0 && udmodel.TCProfit >0)
+                                    {
                                         DetailList.Add(udmodel);
                                     }
                                 }
                             }
                         }
                     }
+                }
                 //酒店
                 var hotelHList = historyList.Where(x => x.OrderType == Common.Enum.Dmc.CRMMergeOrderTypeEnum.Hotel && !(x.Description ?? "").Contains("提成比例变动")).ToList();
                 if (hotelHList.Any())
@@ -1738,12 +1741,15 @@ namespace REBORN.Module.CommissionModule
                                     udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
                                     udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
                                     udmodel.Periods = month;
+                                    if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
+                                    {
                                         DetailList.Add(udmodel);
                                     }
                                 }
                             }
                         }
                     }
+                }
                 //车
                 var carHList = historyList.Where(x => x.OrderType == Common.Enum.Dmc.CRMMergeOrderTypeEnum.Car && !(x.Description ?? "").Contains("提成比例变动")).ToList();
                 if (carHList.Any())
@@ -1771,12 +1777,15 @@ namespace REBORN.Module.CommissionModule
                                     udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
                                     udmodel.Description = $"订单利润变动：由【{hisOrder.OrderProfit}】变更为【{newOrder.Income - newOrder.Refund - newOrder.CostMoney}】";
                                     udmodel.Periods = month;
+                                    if (udmodel.CommissionMoney != 0 && udmodel.OrderProfit > 0)
+                                    {
                                         DetailList.Add(udmodel);
                                     }
                                 }
                             }
                         }
                     }
+                }
                 //门票
                 var ticketHList = historyList.Where(x => x.OrderType == Common.Enum.Dmc.CRMMergeOrderTypeEnum.Ticket && !(x.Description ?? "").Contains("提成比例变动")).ToList();
                 if (ticketHList.Any())
@@ -1807,12 +1816,15 @@ namespace REBORN.Module.CommissionModule
                                     udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
                                     udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
                                     udmodel.Periods = month;
+                                    if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
+                                    {
                                         DetailList.Add(udmodel);
                                     }
                                 }
                             }
                         }
                     }
+                }
                 //单机票
                 var airHList = historyList.Where(x => x.OrderType == Common.Enum.Dmc.CRMMergeOrderTypeEnum.Air && !(x.Description ?? "").Contains("提成比例变动")).ToList();
                 if (airHList.Any())
@@ -1843,6 +1855,8 @@ namespace REBORN.Module.CommissionModule
                                     udmodel.CommissionMoney = Math.Round(udmodel.OrderProfit * udmodel.Rate / 100, 2, MidpointRounding.AwayFromZero);
                                     udmodel.Description = $"订单提成利润变动：由【{hisOrder.OrderProfit}】变更为【{OProfit}】";
                                     udmodel.Periods = month;
+                                    if (udmodel.CommissionMoney != 0 && udmodel.TCProfit > 0)
+                                    {
                                         DetailList.Add(udmodel);
                                     }
                                 }
@@ -1850,6 +1864,7 @@ namespace REBORN.Module.CommissionModule
                         }
                     }
                 }
+            }
             #endregion
 
             #region 适配规则