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

Mall.Module.User/UserModule.cs

@@ -3286,6 +3286,9 @@ namespace Mall.Module.User
                             }
                         }
                     }
+                    else if (umodel.IsDistributor != 1 && umodel.SuperiorId == 0) {
+                        IsShowDistributionCenter = 2;//没有上级  和平下不能显示分销中心
+                    }
                 }
 
                 #endregion

Mall.Repository/User/RB_Member_UserRepository.cs

@@ -373,6 +373,18 @@ WHERE u.TenantId={tenantId} and u.MallBaseId={mallBaseId} and u.SuperiorId ={uid
             return 0;
         }
 
+        /// <summary>
+        /// 获取七天后自动释放
+        /// </summary>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public List<RB_Member_User_Extend> AutoReleaseTheOffline(int tenantId, int mallBaseId)
+        {
+            string sql = $@"SELECT * FROM rb_member_user WHERE DownlineCondition=4 and IsDistributor = 0 and SuperiorId >0 AND DATE_ADD(CreateDate,INTERVAL 7 DAY) < '{DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss")}'";
+            return Get<RB_Member_User_Extend>(sql).ToList();
+        }
+
 
         /// <summary>
         /// 获取下线分销商分页列表
@@ -622,6 +634,7 @@ LEFT JOIN
 LEFT JOIN (SELECT SuperiorId,COUNT(SuperiorId) as ChildrenNum from rb_member_user GROUP BY SuperiorId) as d on d.SuperiorId=a.Id) as t order by {dmodel.OrderBy} ";
             return Get<RB_Member_User_Extend>(sql).ToList();
         }
+
         #endregion
     }
 }

Mall.WindowsService/Helper/TimersHelper.cs

@@ -62,5 +62,24 @@ namespace Mall.WindowsService.Helper
                 }
             }
         }
+
+        /// <summary>
+        /// 七天自动取消下线
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        public void AutoReleaseTheOffline(object sender, System.Timers.ElapsedEventArgs e)
+        {
+            if (Interlocked.Exchange(ref inTimer, 1) == 0)
+            {
+                if (DateTime.Now.Hour == 1)
+                {
+                    LogHelper.Write("AutoReceivingOrder=====Start");
+                    Module.FinanceModule.AutoReleaseTheOffline();
+                    LogHelper.Write("AutoReceivingOrder=====End");
+                    Interlocked.Exchange(ref inTimer, 0);
+                }
+            }
+        }
     }
 }

Mall.WindowsService/Module/FinanceModule.cs

 using Mall.Common;
 using Mall.Common.Enum.Goods;
+using Mall.Common.Enum.User;
 using Mall.Common.Plugin;
 using Mall.Model.Entity.Finance;
 using Mall.Model.Extend.Finance;
@@ -532,5 +533,52 @@ and  DATE_FORMAT(b.CreateDate,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') an
 
         #endregion
 
+        #region 七天自动是否下线
+
+        public static bool AutoReleaseTheOffline() {
+            try
+            {
+                var list = mallBaseRepository.GetListRepository(new Mall.Model.Extend.BaseSetUp.RB_MallBase_Extend() { });
+                foreach (var item in list)
+                {
+                    var ulist = member_UserRepository.AutoReleaseTheOffline(item.TenantId, item.MallBaseId);
+                    foreach (var qitem in ulist) {
+                        Dictionary<string, object> keyValues = new Dictionary<string, object>() {
+                            { nameof(RB_Member_User_Extend.SuperiorId),0},
+                            { nameof(RB_Member_User_Extend.DownlineCondition),DistrbutorReferralsEnum.SCDJ},
+                            { nameof(RB_Member_User_Extend.Remark),(qitem.Remark??"") +"  七天自动释放"},
+                        };
+
+                        List<WhereHelper> wheres = new List<WhereHelper>() {
+                            new WhereHelper(){
+                                 FiledName=nameof(RB_Member_User_Extend.Id),
+                                  FiledValue=qitem.Id,
+                                   OperatorEnum=OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                 FiledName=nameof(RB_Goods_Order_Extend.TenantId),
+                                  FiledValue=item.TenantId,
+                                   OperatorEnum=OperatorEnum.Equal
+                            },
+                            new WhereHelper(){
+                                 FiledName=nameof(RB_Goods_Order_Extend.MallBaseId),
+                                  FiledValue=item.MallBaseId,
+                                   OperatorEnum=OperatorEnum.Equal
+                            }
+                        };
+                        member_UserRepository.Update(keyValues, wheres);
+                    }
+                }
+                return true;
+            }
+            catch (Exception ex)
+            {
+                Helper.LogHelper.Write("AutoReleaseTheOffline:" + ex.Message);
+                return false;
+            }
+        }
+
+        #endregion
+
     }
 }

Mall.WindowsService/WindowsService.cs

@@ -14,6 +14,7 @@ namespace Mall.WindowsService
         System.Timers.Timer timer1;  //计时器
         private System.Timers.Timer timer2;  //订单取消计时器
         private System.Timers.Timer timer3;  //订单自动收货计时器
+        private System.Timers.Timer timer4;  //七天自动取消下线计时器
 
         public WindowsService()
         {
@@ -44,7 +45,7 @@ namespace Mall.WindowsService
             #region 订单自动完成定时器
 
             timer3 = new System.Timers.Timer();
-            timer2 = new System.Timers.Timer
+            timer3 = new System.Timers.Timer
             {
                 Interval = 1000 * (60 * 60) //60分钟调用一次
             };
@@ -52,6 +53,18 @@ namespace Mall.WindowsService
             timer3.Enabled = true;
 
             #endregion
+
+            #region 七天自动取消下线
+
+            timer4 = new System.Timers.Timer();
+            timer4 = new System.Timers.Timer
+            {
+                Interval = 1000 * (60 * 60) //60分钟调用一次
+            };
+            timer4.Elapsed += new System.Timers.ElapsedEventHandler(helper.AutoReleaseTheOffline);
+            timer4.Enabled = true;
+
+            #endregion
         }
 
         protected override void OnStop()
@@ -61,6 +74,7 @@ namespace Mall.WindowsService
             this.timer1.Enabled = false;
             this.timer2.Enabled = false;
             this.timer3.Enabled = false;
+            this.timer4.Enabled = false;
         }
     }
 }