实收金额统计

AppStart/Helper/StatService.cs

@@ -54,7 +54,7 @@ namespace MySystem
                         {
                             ids += idsDr["Id"].ToString() + ",";
                         }
-                        DataTable selfDt = OtherMySqlConn.dtable("select UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(PayMoney),count(Id),sum(MaxDivi) from ConsumerOrders where Id in (" + ids.TrimEnd(',') + ") group by UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d')");
+                        DataTable selfDt = OtherMySqlConn.dtable("select UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d'),sum(PayMoney),count(Id),sum(MaxDivi),sum(MerchantActualAmount) from ConsumerOrders where Id in (" + ids.TrimEnd(',') + ") group by UserId,MerchantId,SnNo,PayMode,IsAct,DATE_FORMAT(CreateDate,'%Y%m%d')");
                         if (selfDt.Rows.Count > 0)
                         {
                             function.WriteLog("统计人数:" + selfDt.Rows.Count + "\n\n", "统计商户和创客交易额日志");
@@ -71,7 +71,7 @@ namespace MySystem
                                 decimal TradeAmount = decimal.Parse(selfDr[6].ToString());
                                 int TradeCount = int.Parse(selfDr[7].ToString());
                                 decimal MaxDivi = decimal.Parse(selfDr[8].ToString());
-                                decimal ActualAmount = TradeAmount - MaxDivi;
+                                decimal ActualAmount = decimal.Parse(selfDr[9].ToString());
                                 string TradeMonth = TradeDate.Substring(0, 6);
 
                                 //创客交易额