Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Extend/Product/RB_Groupbuy_Activity_Step_Extend.cs

@@ -23,12 +23,16 @@ namespace Mall.Model.Entity.Product
         /// </summary>
         public List<RB_Groupbuy_Activity_Step_Price_Extend> StepPriceList { get; set; }
 
-
         /// <summary>
         /// 拼团活动分销佣金列表
         /// </summary>
         public List<RB_GroupBuy_Distributioncommission_Extend> DistributioncommissionList { get; set; }
 
+        /// <summary>
+        /// 分销佣金列表(2号)
+        /// </summary>
+        public List<RB_GroupBuy_Distributioncommission_Extend> DistributionCommissionTreeList { get; set; }
+
         /// <summary>
         /// 拼团活动会员价列表
         /// </summary>

Mall.Module.Product/GroupBuyActivityModule.cs

@@ -488,6 +488,12 @@ namespace Mall.Module.Product
                                 }
                             }
                         }
+
+                        //分销商分销佣金设置
+                        if (groupItem.DistributioncommissionList != null && groupItem.DistributioncommissionList.Count > 0)
+                        { 
+                             
+                        }
                     }
                 }
             }