提交代码

Mall.Module.User/UserCommonModule.cs

@@ -435,9 +435,9 @@ namespace Mall.Module.User
 
 
                 //判断返佣的过期时间
-                if (distributorModel.VipExpiryDate.HasValue)              
+                if (distributorModel.VipExpiryDate.HasValue)
                 {
-                    if (distributorModel.VipExpiryDate.Value > System.DateTime.Now)
+                    if (distributorModel.VipExpiryDate.Value > System.DateTime.Now && distributorModel.FXGradeId == model.GradeId)
                     {
                         int year = model.ExpiryDate.Value.Year - model.CreateDate.Year;
                         distributorModel.VipExpiryDate = Convert.ToDateTime(distributorModel.VipExpiryDate.Value.AddYears((year == 0 ? 1 : year)).AddDays(-1).ToString("yyyy-MM-dd 23:59:59"));
@@ -714,11 +714,12 @@ namespace Mall.Module.User
                                 }
                             }
                         }
-                    }                    
+                    }
                 }
                 vipBuyRepository.DBSession.Commit();
 
-                if (basicModel.IsEnableFXGrade == 1) {
+                if (basicModel.IsEnableFXGrade == 1)
+                {
                     //购买vip之后  其上级验证  如果满足升级  将自动升级为更高级别的分销商
                     System.Threading.Tasks.Task.Run(() => FXAutoUpgradeUserDistributorGrade(BuyUserId, TenantId, MallBaseId));
                 }
@@ -738,7 +739,8 @@ namespace Mall.Module.User
         /// </summary>
         /// <param name="BuyUserId"></param>
         /// <returns></returns>
-        public bool FXAutoUpgradeUserDistributorGrade(int BuyUserId,int TenantId,int MallBaseId) {
+        public bool FXAutoUpgradeUserDistributorGrade(int BuyUserId, int TenantId, int MallBaseId)
+        {
             try
             {
                 var umodel = member_UserRepository.GetEntity(BuyUserId);
@@ -779,18 +781,20 @@ namespace Mall.Module.User
                                 }
                             };
                             bool flag = distributor_InfoRepository.Update(keyValues, wheres);
-                            if (flag) {
+                            if (flag)
+                            {
                                 //继续找其上级的上级
                                 //查询出当前用户的所有上级
                                 var upmodel = member_UserRepository.GetEntity(umodel.SuperiorId);
                                 if (upmodel.SuperiorId > 0)
-                                {                                    
+                                {
                                     string UserIds = member_UserRepository.GetMemberParentIdStr(upmodel.Id);
                                     var ulist = member_UserRepository.GetList(new RB_Member_User_Extend() { UserIds = UserIds, TenantId = TenantId, MallBaseId = MallBaseId });
                                     //查询出用户的所有分销信息
                                     var dlist = distributor_InfoRepository.GetListForSingle(new RB_Distributor_Info_Extend() { UserIds = UserIds, AuditStatus = Common.Enum.User.DistributorAuditStatusEnum.Audited, TenantId = TenantId, MallBaseId = MallBaseId });
                                     int PId = upmodel.SuperiorId ?? 0;
-                                    for (var i = 1; i < ulist.Count(); i++) {
+                                    for (var i = 1; i < ulist.Count(); i++)
+                                    {
                                         if (PId <= 0) { break; }
                                         var uppmodel = ulist.Where(x => x.Id == PId).FirstOrDefault();
                                         if (uppmodel == null) { break; }
@@ -828,11 +832,13 @@ namespace Mall.Module.User
                                                 };
                                                 distributor_InfoRepository.Update(keyValues1, wheres1);
                                             }
-                                            else {
+                                            else
+                                            {
                                                 break;
                                             }
                                         }
-                                        else {
+                                        else
+                                        {
                                             break;
                                         }
 
@@ -842,12 +848,12 @@ namespace Mall.Module.User
                             }
                         }
                     }
-                }   
+                }
                 return true;
             }
             catch (Exception ex)
             {
-                LogHelper.Write(ex, "FXAutoUpgradeUserDistributorGrade自动升级失败，BuyUserId："+ BuyUserId);
+                LogHelper.Write(ex, "FXAutoUpgradeUserDistributorGrade自动升级失败，BuyUserId：" + BuyUserId);
                 return false;
             }
         }