赠送分销等级

Mall.Model/Entity/Product/RB_Goods.cs

@@ -417,5 +417,14 @@ namespace Mall.Model.Entity.Product
         /// 返佣总金额
         /// </summary>
         public decimal Commission { get; set; }
+
+        /// <summary>
+        /// 赠送粉象等级
+        /// </summary>
+        public int? PresentFXGrade { get; set; }
+        /// <summary>
+        /// 赠送的月份  几个月
+        /// </summary>
+        public int? PresentFXMonth { get; set; }
     }
 }

Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs

@@ -214,5 +214,14 @@ namespace Mall.Model.Entity.Product
         /// 积分赠送
         /// </summary>
         public int? IntegralGoodsPresent { get; set; }
+
+        /// <summary>
+        /// 赠送粉象等级
+        /// </summary>
+        public int? PresentFXGrade { get; set; }
+        /// <summary>
+        /// 赠送粉象等级期限（月）
+        /// </summary>
+        public int? PresentFXMonth { get; set; }
     }
 }

Mall.Module.Product/ProductModule.cs

@@ -1260,13 +1260,13 @@ namespace Mall.Module.Product
 
             #region 最高返佣
             model.MaxShare = 0;
+            var BasicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
             if (UserId > 0)
             {
                 //获取分销商信息
                 var disModel = distributor_InfoRepository.GetList(new RB_Distributor_Info_Extend() { TenantId = TenantId, MallBaseId = MallBaseId, UserId = UserId, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited }).FirstOrDefault();
                 if (disModel != null)
                 {
-                    var BasicsModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
                     if ((BasicsModel?.IsEnableFXGrade??2) == 1)
                     {
                         var FXList = distributor_FXGradeRepository.GetList(new RB_Distributor_FXGrade_Extend() { TenantId = TenantId, MallBaseId = MallBaseId });
@@ -1634,6 +1634,22 @@ namespace Mall.Module.Product
             }
             #endregion
 
+            #region 赠送vip会员
+            string PresentFXGradeMsg = "";
+            if ((BasicsModel?.IsEnableFXGrade ?? 2) == 1) 
+            {
+                if (model.PresentFXGrade > 0) {
+                    var fxmodel = distributor_FXGradeRepository.GetEntity(model.PresentFXGrade);
+                    if (fxmodel != null) {
+                        PresentFXGradeMsg = "购买收货后赠送" + fxmodel + "会员";
+                        if (model.PresentFXMonth > 0) {
+                            PresentFXGradeMsg += (model.PresentFXMonth ?? 0) + "个月";
+                        }
+                    }
+                }
+            }
+            #endregion
+
             #region 会员价格
             decimal price_member_max = 0, price_member_min = 0, price_min = 0, price_max = 0;
             if (model.EnjoyMember == 1 && model.SeparateSetMember == 1 && model.MemberPriceList.Any())
@@ -1840,7 +1856,8 @@ namespace Mall.Module.Product
                         integral = new
                         {
                             title = Integral > 0 ? "购买可得" + Integral + "积分" : ""
-                        }
+                        },
+                        PresentFXGradeMsg
                     },
                     //plugin_extra = new List<object>(),
                     express = model.Express,//快递费用   读取默认收货地址 如果没有为0  如果有 根据商品运费匹配 找出快递费用

Mall.Module.User/UserCommonModule.cs

@@ -846,7 +846,7 @@ namespace Mall.Module.User
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "FXAutoUpgradeUserDistributorGrade");
+                LogHelper.Write(ex, "FXAutoUpgradeUserDistributorGrade自动升级失败，BuyUserId："+ BuyUserId);
                 return false;
             }
         }

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -1531,7 +1531,9 @@ namespace Mall.WebApi.Controllers.MallBase
                     })
                 }),
                 model.CarouselImageList,
-                model.ServiceList
+                model.ServiceList,
+                model.PresentFXGrade,
+                model.PresentFXMonth
             });
         }
 
@@ -1981,6 +1983,9 @@ namespace Mall.WebApi.Controllers.MallBase
             demodel.ProxyRises ??= 0;
             demodel.ProxyMoney ??= 0;
             demodel.IsProcurement = 2;//新增时
+
+            demodel.PresentFXGrade ??= 0;//赠送粉象等级
+            demodel.PresentFXMonth ??= 0;
             if (demodel.IsProxy == 1 && demodel.CostPrice > 0)
             {
                 decimal ProxyMoney = 0;

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -108,6 +108,19 @@ namespace Mall.WebApi.Controllers.User
                 int UserId = userModule.AddMemberUserInfo(demodel);
                 bool flag = UserId > 0;
                 if (flag) {
+                    #region 粉象返佣  自动注册分销商 普通会员等级
+                    if ((basicsModel?.IsEnableFXGrade ?? 2) == 1) {
+                        try
+                        {
+                            var FXPModel = userModule.GetFXDistributorGradeList(new RB_Distributor_FXGrade_Extend() { IsGuest = 1, MallBaseId = requestParm.MallBaseId, TenantId = requestParm.TenantId }).FirstOrDefault();
+                            userModule.SetDistributorInfoForFX(FXPModel?.Id ?? 0, UserId, requestParm.TenantId, requestParm.MallBaseId);
+                        }
+                        catch (Exception ex)
+                        {
+                            LogHelper.Write(ex, "粉象模式  自动生成分销商失败，UserId:" + UserId);
+                        }
+                    }
+                    #endregion
                     //返回基本信息
                     TokenUserInfo userInfo = new TokenUserInfo { uid = UserId.ToString(), requestFrom = ApiRequestFromEnum.MiniProgram };
                     #region JWT

Mall.WebApi/Controllers/User/UserVipController.cs

@@ -245,7 +245,7 @@ namespace Mall.WebApi.Controllers.User
                                         },
                                     ColumnHight = 30
                                 };
-                                for (var i = 0; i < 6; i++)
+                                for (var i = 0; i < 5; i++)
                                 {
                                     datarow.ExcelRows.Add(new ExcelColumn(value: "") { });
                                 }

Mall.WindowsService/Mall.WindowsService.csproj

@@ -27,6 +27,7 @@
     <ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
     <ProjectReference Include="..\Mall.DataAccess\Mall.DataAccess.csproj" />
     <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
+    <ProjectReference Include="..\Mall.Module.User\Mall.Module.User.csproj" />
     <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
   </ItemGroup>