|
|
@@ -69,6 +69,17 @@ namespace MySystem
|
|
|
var ParentNavs = user.ParentNav + "," + user.Id;
|
|
|
string[] ParentNavList = ParentNavs.Trim(',').Replace(",,", ",").Split(',');
|
|
|
var ParentNav = ParentNavs.Trim(',').Replace(",,", ",").TrimEnd(',');
|
|
|
+
|
|
|
+ var SnNos = "";
|
|
|
+ DataTable SnNoInfo = CustomerSqlConn.dtable("SELECT SnNo FROM ConsumerOrders WHERE Status>0 AND MerchantId=1358 AND CreateDate>='2023-11-03 00:00:00' AND CreateDate<'2023-11-04 00:00:00' GROUP BY SnNo", AppConfig.Base.SqlConn2);
|
|
|
+ if (SnNoInfo.Rows.Count > 0)
|
|
|
+ {
|
|
|
+ foreach (DataRow selfDr in SnNoInfo.Rows)
|
|
|
+ {
|
|
|
+ SnNos += "'" + selfDr["SnNo"].ToString() + "'" + ",";
|
|
|
+ }
|
|
|
+ SnNos = SnNos.TrimEnd(',');
|
|
|
+ }
|
|
|
try
|
|
|
{
|
|
|
for (DateTime start = DateTime.Parse(startDate.Substring(0, 4) + "-" + startDate.Substring(4, 2) + "-" + startDate.Substring(6, 2)); start <= DateTime.Parse(endDate.Substring(0, 4) + "-" + endDate.Substring(4, 2) + "-" + endDate.Substring(6, 2)); start = start.AddDays(1))
|
|
|
@@ -90,6 +101,9 @@ namespace MySystem
|
|
|
CustomerSqlConn.op("INSERT INTO UserAmountSummary (SeoTitle,PayMode,TotalAmount,TradeMonth,TradeDate,UserId,TradeCount,IsAct) select 'team' SeoTitle,PayMode,SUM(PayMoney) TotalAmount,DATE_FORMAT(CreateDate,'%Y%m') TradeMonth,DATE_FORMAT(CreateDate,'%Y%m%d') TradeDate, " + UserId + " UserId,count(Id) TradeCount,IsAct from ConsumerOrders where Status>0 AND MerchantId=" + merchantId + " AND CreateDate>='" + date + " 00:00:00' and CreateDate<='" + date + " 23:59:59' group by PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),DATE_FORMAT(CreateDate,'%Y%m')", AppConfig.Base.SqlConn2);
|
|
|
}
|
|
|
|
|
|
+ CustomerSqlConn.op("delete from QrCodeAmountSummay where SnNo IN (" + SnNos + ") and TradeDate='" + date.Replace("-", "") + "'", AppConfig.Base.SqlConn2);
|
|
|
+ CustomerSqlConn.op("INSERT INTO QrCodeAmountSummay (IsAct,TradeCount,PayMode,TotalActual,TradeAmount,TradeDate,TradeMonth,SnNo) SELECT IsAct,TradeCount,PayMode,TotalActual,TradeAmount,TradeDate,TradeMonth,SnNo FROM(SELECT PayMode, sum(MerchantActualAmount) TotalActual, sum(PayMoney) TradeAmount, DATE_FORMAT(CreateDate, '%Y%m%d') TradeDate, DATE_FORMAT(CreateDate, '%Y%m') TradeMonth, MerchantId, count(Id) TradeCount, IsAct, SnNo FROM ConsumerOrders WHERE Status > 0 AND MerchantId=" + merchantId + " AND CreateDate>='" + date + " 00:00:00' and CreateDate<='" + date + " 23:59:59' GROUP BY MerchantId, PayMode, IsAct, SnNo, DATE_FORMAT(CreateDate, '%Y%m%d'), DATE_FORMAT(CreateDate, '%Y%m'))a", AppConfig.Base.SqlConn2);
|
|
|
+
|
|
|
CustomerSqlConn.op("delete from QrCodePlateStatServer2.MerchantTradeSummary" + date.Replace("-", "").Substring(0, 6) + " where MerchantId=" + merchantId + "", AppConfig.Base.StatSqlConn2);
|
|
|
CustomerSqlConn.op("INSERT INTO QrCodePlateStatServer2.MerchantTradeSummary" + date.Replace("-", "").Substring(0, 6) + " (MerchantId,TradeAmount,InFactAmount,OderCount,WeChatInfactAmount,AliPayInFactAmount,ActAmount,NonActAmount,TradeMonth) select MerchantId,sum(PayMoney) TradeAmount,sum(MerchantActualAmount) InFactAmount,count(Id) Count,sum(if(PayMode=2,MerchantActualAmount,0)) WeChatInfactAmount,sum(if(PayMode=1,MerchantActualAmount,0)) AliPayInFactAmount,sum(if(IsAct=1,PayMoney,0)) ActAmount,sum(if(IsAct=0,PayMoney,0)) NonActAmount,DATE_FORMAT(CreateDate,'%Y%m') TradeMonth from ConsumerOrders where Status>0 AND MerchantId=" + merchantId + " AND CreateDate>='" + smonth + "-01" + " 00:00:00' and CreateDate<'" + emonth + "-01" + " 00:00:00' group by MerchantId,DATE_FORMAT(CreateDate,'%Y%m')", AppConfig.Base.SqlConn2);
|
|
|
|