lcl 2 месяцев назад
Родитель
Сommit
d46c9655fa

+ 6 - 6
Util/HaoDa/ProfitAfterHelper.cs

@@ -69,7 +69,8 @@ namespace MySystem
                 {
                     try
                     {
-                        DoProfit(content);
+                        string[] data = content.Split('|');
+                        DoProfit(data[0], data[1]);
                     }
                     catch (Exception ex)
                     {
@@ -85,9 +86,9 @@ namespace MySystem
         }
 
         //分润算法
-        public void DoProfit(string otherCondi = "")
+        public void DoProfit(string otherCondi = "", string TradeMonth = "")
         {
-            string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            if(string.IsNullOrEmpty(TradeMonth)) TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             if(string.IsNullOrEmpty(otherCondi))
             {
                 string check = function.ReadInstance("/ProfitFlag/" + TradeMonth + "-after.txt");
@@ -149,7 +150,7 @@ namespace MySystem
                 KxsUserModels.KxsUser topUser = udb.KxsUser.FirstOrDefault(a => a.Id == TopUserId) ?? new KxsUserModels.KxsUser();
                 LogHelper.Instance.WriteLog("---UserId:" + UserId + ";TotalAmount:" + TotalAmount + ";", "来客吧分润日志");
                 List<ProfitResult> list = new List<ProfitResult>();
-                list = StartProft(TotalAmount, 1, users, Sort, IsActive);
+                list = StartProft(TradeMonth, TotalAmount, 1, users, Sort, IsActive);
                 LogHelper.Instance.WriteLog("---list:" + list.Count + ";", "来客吧分润日志");
                 try
                 {
@@ -212,10 +213,9 @@ namespace MySystem
         #endregion
 
         #region 分润算法
-        public List<ProfitResult> StartProft(decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
+        public List<ProfitResult> StartProft(string Month, decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
         {
             LogHelper.Instance.WriteLog("\n\nTotalAmount:" + TotalAmount + ";", "来客吧分润日志");
-            string Month = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             WebCMSEntities db = new WebCMSEntities();
             KxsUserModels.WebCMSEntities udb = new KxsUserModels.WebCMSEntities();
             List<UserLevelSet> levels = db.UserLevelSet.ToList();

+ 6 - 6
Util/HaoDa/ProfitAfterNewHelper.cs

@@ -69,7 +69,8 @@ namespace MySystem
                 {
                     try
                     {
-                        DoProfit(content);
+                        string[] data = content.Split('|');
+                        DoProfit(data[0], data[1]);
                     }
                     catch (Exception ex)
                     {
@@ -85,9 +86,9 @@ namespace MySystem
         }
 
         //分润算法
-        public void DoProfit(string otherCondi = "")
+        public void DoProfit(string otherCondi = "", string TradeMonth = "")
         {
-            string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            if(string.IsNullOrEmpty(TradeMonth)) TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             if(string.IsNullOrEmpty(otherCondi))
             {
                 string check = function.ReadInstance("/ProfitFlag/" + TradeMonth + "-after-new.txt");
@@ -149,7 +150,7 @@ namespace MySystem
                 KxsUserModels.KxsUser topUser = udb.KxsUser.FirstOrDefault(a => a.Id == TopUserId) ?? new KxsUserModels.KxsUser();
                 LogHelper.Instance.WriteLog("---UserId:" + UserId + ";TotalAmount:" + TotalAmount + ";", "来客吧分润日志");
                 List<ProfitResult> list = new List<ProfitResult>();
-                list = StartProft(TotalAmount, 1, users, Sort, IsActive);
+                list = StartProft(TradeMonth, TotalAmount, 1, users, Sort, IsActive);
                 LogHelper.Instance.WriteLog("---list:" + list.Count + ";", "来客吧分润日志");
                 try
                 {
@@ -213,10 +214,9 @@ namespace MySystem
         #endregion
 
         #region 分润算法
-        public List<ProfitResult> StartProft(decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
+        public List<ProfitResult> StartProft(string Month, decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
         {
             LogHelper.Instance.WriteLog("\n\nTotalAmount:" + TotalAmount + ";", "来客吧分润日志");
-            string Month = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             WebCMSEntities db = new WebCMSEntities();
             KxsUserModels.WebCMSEntities udb = new KxsUserModels.WebCMSEntities();
             List<UserLevelSet> levels = db.UserLevelSet.ToList();

+ 6 - 6
Util/HaoDa/ProfitBeforeHelper.cs

@@ -69,7 +69,8 @@ namespace MySystem
                 {
                     try
                     {
-                        DoProfit(content);
+                        string[] data = content.Split('|');
+                        DoProfit(data[0], data[1]);
                     }
                     catch (Exception ex)
                     {
@@ -85,9 +86,9 @@ namespace MySystem
         }
 
         //分润算法
-        public void DoProfit(string otherCondi = "")
+        public void DoProfit(string otherCondi = "", string TradeMonth = "")
         {
-            string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            if(string.IsNullOrEmpty(TradeMonth)) TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             if(string.IsNullOrEmpty(otherCondi))
             {
                 string check = function.ReadInstance("/ProfitFlag/" + TradeMonth + "-before.txt");
@@ -149,7 +150,7 @@ namespace MySystem
                 KxsUserModels.KxsUser topUser = udb.KxsUser.FirstOrDefault(a => a.Id == TopUserId) ?? new KxsUserModels.KxsUser();
                 LogHelper.Instance.WriteLog("---UserId:" + UserId + ";TotalAmount:" + TotalAmount + ";", "来客吧分润日志");
                 List<ProfitResult> list = new List<ProfitResult>();
-                list = StartProft(TotalAmount, 1, users, Sort, IsActive);
+                list = StartProft(TradeMonth, TotalAmount, 1, users, Sort, IsActive);
                 LogHelper.Instance.WriteLog("---list:" + list.Count + ";", "来客吧分润日志");
                 try
                 {
@@ -214,10 +215,9 @@ namespace MySystem
         #endregion
 
         #region 分润算法
-        public List<ProfitResult> StartProft(decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
+        public List<ProfitResult> StartProft(string Month, decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
         {
             LogHelper.Instance.WriteLog("\n\nTotalAmount:" + TotalAmount + ";", "来客吧分润日志");
-            string Month = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             WebCMSEntities db = new WebCMSEntities();
             KxsUserModels.WebCMSEntities udb = new KxsUserModels.WebCMSEntities();
             List<UserLevelSet> levels = db.UserLevelSet.ToList();

+ 6 - 6
Util/HaoDa/ProfitBeforeNewHelper.cs

@@ -69,7 +69,8 @@ namespace MySystem
                 {
                     try
                     {
-                        DoProfit(content);
+                        string[] data = content.Split('|');
+                        DoProfit(data[0], data[1]);
                     }
                     catch (Exception ex)
                     {
@@ -85,9 +86,9 @@ namespace MySystem
         }
 
         //分润算法
-        public void DoProfit(string otherCondi = "")
+        public void DoProfit(string otherCondi = "", string TradeMonth = "")
         {
-            string TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
+            if(string.IsNullOrEmpty(TradeMonth)) TradeMonth = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             if(string.IsNullOrEmpty(otherCondi))
             {
                 string check = function.ReadInstance("/ProfitFlag/" + TradeMonth + "-before-new.txt");
@@ -149,7 +150,7 @@ namespace MySystem
                 KxsUserModels.KxsUser topUser = udb.KxsUser.FirstOrDefault(a => a.Id == TopUserId) ?? new KxsUserModels.KxsUser();
                 LogHelper.Instance.WriteLog("---UserId:" + UserId + ";TotalAmount:" + TotalAmount + ";", "来客吧分润日志");
                 List<ProfitResult> list = new List<ProfitResult>();
-                list = StartProft(TotalAmount, 1, users, Sort, IsActive);
+                list = StartProft(TradeMonth, TotalAmount, 1, users, Sort, IsActive);
                 LogHelper.Instance.WriteLog("---list:" + list.Count + ";", "来客吧分润日志");
                 try
                 {
@@ -215,10 +216,9 @@ namespace MySystem
         #endregion
 
         #region 分润算法
-        public List<ProfitResult> StartProft(decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
+        public List<ProfitResult> StartProft(string Month, decimal TotalAmount, int LevelKindId, List<ProfitUsers> users, int Sort, bool IsActive = true)
         {
             LogHelper.Instance.WriteLog("\n\nTotalAmount:" + TotalAmount + ";", "来客吧分润日志");
-            string Month = DateTime.Now.AddMonths(-1).ToString("yyyyMM");
             WebCMSEntities db = new WebCMSEntities();
             KxsUserModels.WebCMSEntities udb = new KxsUserModels.WebCMSEntities();
             List<UserLevelSet> levels = db.UserLevelSet.ToList();