Merge branch 'master' of http://gitlab.oytour.com/liudong1993/huatu_api

REBORN.Module.CommissionModule/MergeCommissionModule2.cs

@@ -321,6 +321,7 @@ namespace REBORN.Module.CommissionModule
                 }
             }
             else { return null; }
+            if (RModel.SaleRate == Convert.ToDecimal(0.01)) { RModel.SaleRate = 0; }
             return RModel;
         }
 
@@ -340,6 +341,10 @@ namespace REBORN.Module.CommissionModule
             {
                 if (!demodel.AppointOPInfoList.Where(x => x.OPType == 1).Any()) { return "请传递签证提成列表"; }
             }
+            if (demodel.SaleRate == 0) {
+                //设置提成=0 
+                demodel.SaleRate = Convert.ToDecimal(0.01);//使用0.01表示， 发放提成时 验证=0.01 则不发提出
+            }
             if (demodel.OrderType == (int)Common.Enum.ResourceTypeEnum.TeamPrice)
             {
                 //团队
@@ -867,6 +872,7 @@ namespace REBORN.Module.CommissionModule
                             //销售
                             if (qitem.SaleRate > 0)
                             {
+                                if (qitem.SaleRate == Convert.ToDecimal(0.01)) { qitem.SaleRate = 0; }
                                 var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
                                 smodel.UserId = qitem.EnterID ?? 0;
                                 smodel.Rate = qitem.SaleRate;
@@ -1037,6 +1043,7 @@ namespace REBORN.Module.CommissionModule
                         //销售
                         if (item.SaleRate > 0)
                         {
+                            if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                             var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
                             smodel.UserId = item.CreateBy ?? 0;
                             smodel.Rate = item.SaleRate;
@@ -1186,6 +1193,7 @@ namespace REBORN.Module.CommissionModule
                         //销售
                         if (item.SaleRate > 0)
                         {
+                            if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                             var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
                             smodel.UserId = item.EnterID;
                             smodel.Rate = item.SaleRate;
@@ -1409,6 +1417,7 @@ namespace REBORN.Module.CommissionModule
                         //销售
                         if (item.SaleRate > 0)
                         {
+                            if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                             var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
                             smodel.UserId = item.EnterID;
                             smodel.Rate = item.SaleRate;
@@ -1549,6 +1558,7 @@ namespace REBORN.Module.CommissionModule
                     //销售
                     if (item.SaleRate > 0)
                     {
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         var smodel = JsonHelper.DeserializeObject<RB_B2BSale_Commission_Details_Extend>(JsonHelper.Serialize(dmodel));
                         smodel.UserId = item.CreateBy;
                         smodel.Rate = item.SaleRate;

REBORN.Module.DMCModule/VisaModule.cs

@@ -4362,6 +4362,7 @@ TEL:03-3779-9111";
                         {
                             item.SaleRate = ruleOrderModel?.SaleRate ?? 0;
                         }
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         if (item.AppointOPList != null && item.AppointOPList.Any())
                         {
                             foreach (var qitem in item.AppointOPList)

REBORN.Module.SellModule/CustomerOrderModule.cs

@@ -1689,6 +1689,7 @@ namespace REBORN.Module.SellModule
                         {
                             item.SaleRate = ruleOrderModel?.SaleRate ?? 0;
                         }
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         if (item.AppointOPList != null && item.AppointOPList.Any())
                         {
                             foreach (var qitem in item.AppointOPList)
@@ -4103,6 +4104,7 @@ namespace REBORN.Module.SellModule
                         {
                             item.SaleRate = ruleOrderModel?.SaleRate ?? 0;
                         }
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         if ((ruleOrderModel?.ManagerRate ?? 0) == 0)
                         {
                             item.ManagerRate = -1;//不显示主管提成
@@ -5447,6 +5449,7 @@ namespace REBORN.Module.SellModule
                         {
                             item.SaleRate = ruleOrderModel?.SaleRate ?? 0;
                         }
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         if (item.AppointOPList != null && item.AppointOPList.Any())
                         {
                             foreach (var qitem in item.AppointOPList)

REBORN.Module.SellModule/SellOrderModule.cs

@@ -18050,6 +18050,7 @@ namespace REBORN.Module.SellModule
                         if (item.SaleRate <= 0) {
                             item.SaleRate = ruleOrderModel?.SaleRate ?? 0;
                         }
+                        if (item.SaleRate == Convert.ToDecimal(0.01)) { item.SaleRate = 0; }
                         if ((ruleOrderModel?.ManagerRate ?? 0) == 0)
                         {
                             item.ManagerRate = -1;//不显示主管提成