فهرست منبع

创客-首页-我的商户-商户详情-交易统计,读取数据库不对,已修复

lcl 1 سال پیش
والد
کامیت
af6c14c307
1فایلهای تغییر یافته به همراه2 افزوده شده و 2 حذف شده
  1. 2 2
      Areas/Api/Controllers/Main/MerchantInfoController.cs

+ 2 - 2
Areas/Api/Controllers/Main/MerchantInfoController.cs

@@ -382,7 +382,7 @@ namespace MySystem.Areas.Api.Controllers.v1
                 int skipNum = PageSize * (PageNum - 1);
                 limit = " limit " + skipNum + "," + PageSize;
             }
-            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "' group by TradeDate order by TradeDate desc" + limit, AppConfig.Base.SqlConnStr);
+            DataTable dt = CustomerSqlConn.dtable("select TradeDate,sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "' group by TradeDate order by TradeDate desc" + limit, AppConfig.Base.ZsSqlConnStr);
             foreach (DataRow dr in dt.Rows)
             {
                 string TradeDate = dr["TradeDate"].ToString();
@@ -397,7 +397,7 @@ namespace MySystem.Areas.Api.Controllers.v1
             other = new Dictionary<string, object>();
             if (PageNum == 1)
             {
-                DataTable total = CustomerSqlConn.dtable("select sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "'", AppConfig.Base.SqlConnStr);
+                DataTable total = CustomerSqlConn.dtable("select sum(TradeAmount),sum(TradeCount),sum(if(IsAct=1, TradeAmount, 0)),sum(if(IsAct=0, TradeAmount, 0)) from MerchantAmountSummay where MerchantId=" + MerchantId + " and TradeMonth='" + TradeMonth + "'", AppConfig.Base.ZsSqlConnStr);
                 decimal TradeAmt = 0;
                 decimal ActTradeAmt = 0;
                 decimal UnActTradeAmt = 0;