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