|
|
@@ -83,7 +83,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString())); //商户Id
|
|
|
- string TradeDate = data["TradeMonth"].ToString(); //日期
|
|
|
+ string TradeDate = data["TradeDate"].ToString(); //日期
|
|
|
int pageSize = int.Parse(function.CheckInt(data["PageSize"].ToString()));
|
|
|
int pageNum = int.Parse(function.CheckInt(data["PageNum"].ToString()));
|
|
|
string condition = " and Status>=1";
|
|
|
@@ -93,8 +93,8 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
}
|
|
|
if (!string.IsNullOrEmpty(data["TradeDate"].ToString()))
|
|
|
{
|
|
|
- var start = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 6) + "-" + TradeDate.Substring(6, 8) + " 00:00:00";
|
|
|
- var end = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 6) + "-" + TradeDate.Substring(6, 8) + " 23:59:59";
|
|
|
+ var start = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " 00:00:00";
|
|
|
+ var end = TradeDate.Substring(0, 4) + "-" + TradeDate.Substring(4, 2) + "-" + TradeDate.Substring(6, 2) + " 23:59:59";
|
|
|
condition += " and CreateDate>='" + start + "' and CreateDate<='" + end + "'";
|
|
|
}
|
|
|
|
