|
@@ -168,6 +168,7 @@ namespace MySystem
|
|
}
|
|
}
|
|
CurDiviPersons -= 1;
|
|
CurDiviPersons -= 1;
|
|
}
|
|
}
|
|
|
|
+ TotalActual = PayMoney * GetPercent + (DiviPersons - CurDiviPersons) * DiviMoney;
|
|
|
|
|
|
//创客分润
|
|
//创客分润
|
|
// DoProfit(db, order);
|
|
// DoProfit(db, order);
|
|
@@ -175,60 +176,60 @@ namespace MySystem
|
|
//代理商分润
|
|
//代理商分润
|
|
// AgentProfit(db, order);
|
|
// AgentProfit(db, order);
|
|
}
|
|
}
|
|
- TotalActual = PayMoney * (GetPercent - cusumerFeePercent);
|
|
|
|
}
|
|
}
|
|
else
|
|
else
|
|
{
|
|
{
|
|
- TotalActual = PayMoney * cusumerFeePercent;
|
|
|
|
|
|
+ TotalActual = PayMoney * (1 - cusumerFeePercent);
|
|
}
|
|
}
|
|
|
|
|
|
//统计商户数据
|
|
//统计商户数据
|
|
string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
|
|
string MonthString = order.UpdateDate.Value.ToString("yyyyMM");
|
|
string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
|
|
string DateString = order.UpdateDate.Value.ToString("yyyyMMdd");
|
|
TotalActual = PublicFunction.NumberFormat(TotalActual);
|
|
TotalActual = PublicFunction.NumberFormat(TotalActual);
|
|
|
|
+ function.WriteLog(TotalActual.ToString(), "监控退款队列");
|
|
merchant.TotalActual += TotalActual;
|
|
merchant.TotalActual += TotalActual;
|
|
db.SaveChanges();
|
|
db.SaveChanges();
|
|
BothdisDbconn.Instance.SendMq("MerchantInfo:" + order.MerchantId, merchant);
|
|
BothdisDbconn.Instance.SendMq("MerchantInfo:" + order.MerchantId, merchant);
|
|
|
|
|
|
- List<string> Months = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId, 1, 1000);
|
|
|
|
- if (!Months.Contains(MonthString))
|
|
|
|
|
|
+ List<string> Dates = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId + ":" + MonthString, 1, 1000);
|
|
|
|
+ if (!Dates.Contains(DateString))
|
|
{
|
|
{
|
|
- BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId, MonthString);
|
|
|
|
|
|
+ BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId + ":" + MonthString, DateString);
|
|
}
|
|
}
|
|
MerchantIndexStat DateIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + DateString) ?? new MerchantIndexStat();
|
|
MerchantIndexStat DateIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + DateString) ?? new MerchantIndexStat();
|
|
DateIndexStat.TotalOrder += 1;
|
|
DateIndexStat.TotalOrder += 1;
|
|
DateIndexStat.TotalAmount += PayMoney;
|
|
DateIndexStat.TotalAmount += PayMoney;
|
|
- DateIndexStat.TotalActual = TotalActual;
|
|
|
|
|
|
+ DateIndexStat.TotalActual += TotalActual;
|
|
if (order.PayMode == 1)
|
|
if (order.PayMode == 1)
|
|
{
|
|
{
|
|
DateIndexStat.AlipayTotalAmount += PayMoney;
|
|
DateIndexStat.AlipayTotalAmount += PayMoney;
|
|
- DateIndexStat.AlipayTotalActual = TotalActual;
|
|
|
|
|
|
+ DateIndexStat.AlipayTotalActual += TotalActual;
|
|
}
|
|
}
|
|
else if (order.PayMode == 2)
|
|
else if (order.PayMode == 2)
|
|
{
|
|
{
|
|
DateIndexStat.WeChatTotalAmount += PayMoney;
|
|
DateIndexStat.WeChatTotalAmount += PayMoney;
|
|
- DateIndexStat.WeChatTotalActual = TotalActual;
|
|
|
|
|
|
+ DateIndexStat.WeChatTotalActual += TotalActual;
|
|
}
|
|
}
|
|
BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + DateString, DateIndexStat);
|
|
BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + DateString, DateIndexStat);
|
|
|
|
|
|
- List<string> Dates = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId + ":" + MonthString, 1, 1000);
|
|
|
|
- if (!Dates.Contains(DateString))
|
|
|
|
|
|
+ List<string> Months = BothdisDbconn.Instance.GetList<string>("ConsumerStat:" + MerchantId, 1, 1000);
|
|
|
|
+ if (!Months.Contains(MonthString))
|
|
{
|
|
{
|
|
- BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId + ":" + MonthString, DateString);
|
|
|
|
|
|
+ BothdisDbconn.Instance.AddList("ConsumerStat:" + MerchantId, MonthString);
|
|
}
|
|
}
|
|
MerchantIndexStat MonthIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + MonthString) ?? new MerchantIndexStat();
|
|
MerchantIndexStat MonthIndexStat = BothdisDbconn.Instance.Get<MerchantIndexStat>("MerchantIndexStat:" + MerchantId + ":" + MonthString) ?? new MerchantIndexStat();
|
|
MonthIndexStat.TotalOrder += 1;
|
|
MonthIndexStat.TotalOrder += 1;
|
|
MonthIndexStat.TotalAmount += PayMoney;
|
|
MonthIndexStat.TotalAmount += PayMoney;
|
|
- MonthIndexStat.TotalActual = TotalActual;
|
|
|
|
|
|
+ MonthIndexStat.TotalActual += TotalActual;
|
|
if (order.PayMode == 1)
|
|
if (order.PayMode == 1)
|
|
{
|
|
{
|
|
MonthIndexStat.AlipayTotalAmount += PayMoney;
|
|
MonthIndexStat.AlipayTotalAmount += PayMoney;
|
|
- MonthIndexStat.AlipayTotalActual = TotalActual;
|
|
|
|
|
|
+ MonthIndexStat.AlipayTotalActual += TotalActual;
|
|
}
|
|
}
|
|
else if (order.PayMode == 2)
|
|
else if (order.PayMode == 2)
|
|
{
|
|
{
|
|
MonthIndexStat.WeChatTotalAmount += PayMoney;
|
|
MonthIndexStat.WeChatTotalAmount += PayMoney;
|
|
- MonthIndexStat.WeChatTotalActual = TotalActual;
|
|
|
|
|
|
+ MonthIndexStat.WeChatTotalActual += TotalActual;
|
|
}
|
|
}
|
|
BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + MonthString, MonthIndexStat);
|
|
BothdisDbconn.Instance.Set("MerchantIndexStat:" + MerchantId + ":" + MonthString, MonthIndexStat);
|
|
|
|
|
|
@@ -237,6 +238,7 @@ namespace MySystem
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + DateString, PayMoney);
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + DateString, PayMoney);
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
|
|
BothdisDbconn.Instance.AddNumber("TeamTradeStat:" + UserId + ":" + PayMode + ":" + DateString, PayMoney);
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
tran.Commit();
|
|
tran.Commit();
|