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

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

@@ -3658,7 +3658,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)
                             {
@@ -3712,15 +3712,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;
+                                    }
+                                    else {
+                                        OneDistributorGrade = -1;//不是分销商
+                                    }
                                 }
-                                if (TwoUserId > 0)
+                                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;
+                                    }
+                                    else {
+                                        TwoDistributorGrade = -1;
+                                    }
                                 }
-                                if (ThreeUserId > 0)
+                                if (ThreeUserId > 0 && TwoDistributorGrade >=0)
                                 {
-                                    ThreeDistributorGrade = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId, UserId = ThreeUserId })?.FirstOrDefault()?.GradeId ?? 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 = dis3Model?.GradeId ?? 0;
+                                    }
+                                    else {
+                                        ThreeDistributorGrade = -1;
+                                    }
                                 }
                                 #endregion
                                 #region 分销商等级列表
@@ -3815,7 +3834,10 @@ namespace Mall.Module.Product
                                                     Type = 1,
                                                     IsRemit = 0
                                                 };
-                                                gocList.Add(gocModel);
+                                                if (OneDistributorGrade != -1)
+                                                {
+                                                    gocList.Add(gocModel);
+                                                }
                                                 break;
                                             case 2:
                                                 if (TwoUserId > 0)
@@ -3883,7 +3905,10 @@ namespace Mall.Module.Product
                                                         Type = 1,
                                                         IsRemit = 0
                                                     };
-                                                    gocList.Add(gocModel);
+                                                    if (TwoDistributorGrade != -1)
+                                                    {
+                                                        gocList.Add(gocModel);
+                                                    }
                                                 }
                                                 break;
                                             case 3:
@@ -3965,7 +3990,10 @@ namespace Mall.Module.Product
                                                         Type = 1,
                                                         IsRemit = 0
                                                     };
-                                                    gocList.Add(gocModel);
+                                                    if (ThreeDistributorGrade != -1)
+                                                    {
+                                                        gocList.Add(gocModel);
+                                                    }
                                                 }
                                                 break;
 

Mall.Module.Product/ProductModule.cs

@@ -1921,7 +1921,7 @@ namespace Mall.Module.Product
             };
             #endregion
             #endregion
-        }
+        }        
 
         /// <summary>
         /// 获取小程序商品视频分页列表
@@ -5900,6 +5900,38 @@ namespace Mall.Module.Product
         {
             return distributor_InfoRepository.GetList(dmodel);
         }
+
+        /// <summary>
+        /// 获取VIP等级信息
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public object GetAppletVipGradeInfo(int tenantId, int mallBaseId)
+        {
+            var disModel = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, IsGuest = 3 }).FirstOrDefault();
+            if (disModel != null)
+            {
+                return new
+                {
+                    Status = 1,
+                    VIPModel = new
+                    {
+                        disModel.Id,
+                        disModel.Grade,
+                        disModel.GradeName
+                    }
+                };
+            }
+            else
+            {
+                return new
+                {
+                    Status = 2,
+                    VIPModel = new { }
+                };
+            }
+        }
         #endregion
 
 

Mall.WebApi/Controllers/Product/AppletGoodsController.cs

@@ -1128,6 +1128,23 @@ namespace Mall.WebApi.Controllers.MallBase
             });
         }
 
+        /// <summary>
+        /// 获取粉象模式   Vip等级id
+        /// </summary>
+        /// <param name="requestMsg"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetAppletVipGradeInfo(object requestMsg) {
+            var req = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
+            if (req.MallBaseId <= 0)
+            {
+                return ApiResult.ParamIsNull();
+            }
+
+            var Robj = productModule.GetAppletVipGradeInfo(req.TenantId, req.MallBaseId);
+            return ApiResult.Success("", Robj);
+        }
+
         #endregion
 
         #region 生产海报

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -1555,6 +1555,82 @@ namespace Mall.WebApi.Controllers.MallBase
 
         }
 
+
+        /// <summary>
+        /// 分销订单后台分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetDistributionOrdersPageListForRecommend()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = parms.TenantId;
+            demodel.MallBaseId = parms.MallBaseId;
+            demodel.Recycled = 2;
+            var list = orderModule.GetDistributionOrdersPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.OrderId,
+                x.OrderNo,
+                x.MerchantsNo,
+                x.OrderSource,
+                OrderSourceName = x.OrderSource.GetEnumName(),
+                x.UserId,
+                x.UserName,
+                x.DeliveryMethod,
+                DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
+                x.Income,
+                x.FreightMoney,
+                x.CouponMoney,
+                x.PaymentWay,
+                PaymentWayName = x.PaymentWay.GetEnumName(),
+                DetailList = x.DetailList.Select(y => new
+                {
+                    y.Id,
+                    y.CoverImage,
+                    y.CoverImagePath,
+                    y.OrderType,
+                    OrderTypeName = y.OrderType.GetEnumName(),
+                    y.GoodsName,
+                    SpecificationList = JsonConvert.DeserializeObject<List<string>>(y.Specification),
+                    y.ProductCode,
+                    y.Final_Price,
+                    y.Number
+                }),
+                x.Consignee,
+                x.Mobile,
+                x.ShoppingAddress,
+                x.BuyerMessage,
+                x.Remark,
+                x.OrderStatus,
+                OrderStatusName = x.OrderStatus.GetEnumName(),
+                PaymentTime = x.PaymentTime.HasValue ? x.PaymentTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                DeliveryTime = x.DeliveryTime.HasValue ? x.DeliveryTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                ReceivingTime = x.ReceivingTime.HasValue ? x.ReceivingTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.IsOrderCommission,
+                OrderCommissionList = x.OrderCommissionList.Select(z => new
+                {
+                    z.Id,
+                    z.Grade,
+                    z.GradeDescription,
+                    z.UserId,
+                    z.UserName,
+                    z.Mobile,
+                    z.Name,
+                    z.Commission,
+                    z.CommissionState
+                }),
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
         #endregion
 
         #region 售后订单