赞羊返佣调整+推荐供应商

Mall.Model/Entity/Product/RB_Goods_OrderIntroduction.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品订单介绍返佣信息表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderIntroduction
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单id
+        /// </summary>        
+        public int? OrderId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 订单明细id
+        /// </summary>
+        public int? OrderDetailId { get; set; }
+        /// <summary>
+        /// 分销商id
+        /// </summary>        
+        public int? UserId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 返利比例  百分比
+        /// </summary>        
+        public decimal? CommissionRatio
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 佣金
+        /// </summary>        
+        public decimal? Commission
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 佣金状态  1待返佣   2已返佣  
+        /// </summary>        
+        public int? CommissionState
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 类型  1介绍供应商返利
+        /// </summary>
+        public int? Type { get; set; }
+        /// <summary>
+        /// Remark
+        /// </summary>        
+        public string Remark
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 打款状态   1已打款   2未打款
+        /// </summary>
+        public int? RemitStatus { get; set; }
+    }
+}

Mall.Model/Extend/Product/RB_Goods_OrderIntroduction_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品订单介绍返佣表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Goods_OrderIntroduction_Extend : RB_Goods_OrderIntroduction
+    {
+        /// <summary>
+        /// ids
+        /// </summary>
+        public string OrderIds { get; set; }
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        public string OrderNo { get; set; }
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 手机号码
+        /// </summary>
+        public string Mobile { get; set; }
+        /// <summary>
+        /// 用户头像
+        /// </summary>
+        public string Photo { get; set; }
+        /// <summary>
+        /// 分销订单查询状态  0全部  1代付款  2已付款  3已完成
+        /// </summary>
+        public int? DistrbutionOrderSelectStatus { get; set; }
+        /// <summary>
+        /// 订单明细列表
+        /// </summary>
+        public List<RB_Goods_OrderDetail_Extend> OrderDetailList { get; set; }
+        /// <summary>
+        /// 待返佣金额
+        /// </summary>
+        public decimal WaitCommission { get; set; }
+    }
+}

Mall.Module.Product/OrderModule.cs

@@ -3645,7 +3645,7 @@ namespace Mall.Module.Product
                             }
                             #region 分销商id+分销商等级
                             int OneUserId = 0, TwoUserId = 0, ThreeUserId = 0;
-                            int OneDistributorGrade = 0, TwoDistributorGrade = 0, ThreeDistributorGrade = 0;
+                            int OneDistributorGrade = -1, TwoDistributorGrade = -1, ThreeDistributorGrade = -1;
                             //获取多级 分销商id
                             if (basicModel != null && basicModel.DistributorTier > 0)
                             {
@@ -3699,15 +3699,34 @@ namespace Mall.Module.Product
                                 #endregion
                                 if (OneUserId > 0)
                                 {
-                                    OneDistributorGrade = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = OneUserId })?.FirstOrDefault()?.GradeId ?? 0;
+                                    var dis1Model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = OneUserId, AuditStatus = DistributorAuditStatusEnum.Audited })?.FirstOrDefault();
+                                    if (dis1Model != null) {
+                                        OneDistributorGrade = dis1Model?.GradeId ?? 0;
                                     }
-                                if (TwoUserId > 0)
+                                    else {
+                                        OneDistributorGrade = -1;//不是分销商
+                                    }
+                                }
+                                if (TwoUserId > 0 && OneDistributorGrade >=0)
                                 {
-                                    TwoDistributorGrade = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = TwoUserId })?.FirstOrDefault()?.GradeId ?? 0;
+                                    var dis2Model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = TwoUserId, AuditStatus = DistributorAuditStatusEnum.Audited })?.FirstOrDefault();
+                                    if (dis2Model != null) {
+                                        TwoDistributorGrade = dis2Model?.GradeId ?? 0;
                                     }
-                                if (ThreeUserId > 0)
+                                    else {
+                                        TwoDistributorGrade = -1;
+                                    }
+                                }
+                                if (ThreeUserId > 0 && TwoDistributorGrade >=0)
+                                {
+                                    var dis3Model = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = ThreeUserId, AuditStatus = DistributorAuditStatusEnum.Audited })?.FirstOrDefault();
+                                    if (dis3Model != null)
                                     {
-                                    ThreeDistributorGrade = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = ThreeUserId })?.FirstOrDefault()?.GradeId ?? 0;
+                                        ThreeDistributorGrade = dis3Model?.GradeId ?? 0;
+                                    }
+                                    else {
+                                        ThreeDistributorGrade = -1;
+                                    }
                                 }
                                 #endregion
                                 #region 分销商等级列表
@@ -3802,7 +3821,10 @@ namespace Mall.Module.Product
                                                     Type = 1,
                                                     IsRemit = 0
                                                 };
+                                                if (OneDistributorGrade != -1)
+                                                {
                                                     gocList.Add(gocModel);
+                                                }
                                                 break;
                                             case 2:
                                                 if (TwoUserId > 0)
@@ -3870,8 +3892,11 @@ namespace Mall.Module.Product
                                                         Type = 1,
                                                         IsRemit = 0
                                                     };
+                                                    if (TwoDistributorGrade != -1)
+                                                    {
                                                         gocList.Add(gocModel);
                                                     }
+                                                }
                                                 break;
                                             case 3:
                                                 if (ThreeUserId > 0)
@@ -3952,8 +3977,11 @@ namespace Mall.Module.Product
                                                         Type = 1,
                                                         IsRemit = 0
                                                     };
+                                                    if (ThreeDistributorGrade != -1)
+                                                    {
                                                         gocList.Add(gocModel);
                                                     }
+                                                }
                                                 break;
 
                                         }