|
@@ -65,6 +65,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Dictionary<string, object> curData = new Dictionary<string, object>();
|
|
|
curData.Add("Name", subdata["Name"]); //名称
|
|
|
curData.Add("Id", subdata["Id"]); //Id
|
|
|
+ curData.Add("BrandId", subdata["BrandId"]); //品牌(0 银联 1 好哒)
|
|
|
curData.Add("CreateDate", subdata["CreateDate"]); //CreateDate
|
|
|
curData.Add("Status", subdata["Status"]); //Status
|
|
|
curData.Add("SubjectType", AddInfo.SubjectType); //主体类型
|
|
@@ -325,6 +326,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
curData.Add("MerchantName", item.Name); //商户姓名
|
|
|
curData.Add("KqRegTime", item.CreateDate == null ? "" : item.CreateDate.Value.ToString("yyyy-MM-dd")); //渠道注册时间
|
|
|
curData.Add("Id", item.Id); //Id
|
|
|
+ curData.Add("BrandId", item.BrandId); //品牌(0 银联 1 好哒)
|
|
|
curData.Add("TotalAmount", item.TotalAmount.ToString("f2")); //交易额
|
|
|
curData.Add("TodayTrade", MerchantTradeStat.Instance.Amount(item.Id, DateTime.Now.ToString("yyyyMMdd")).ToString("f2")); //今日交易额
|
|
|
curData.Add("TradeCount", item.TotalConsumeCount); //交易笔数
|
|
@@ -661,6 +663,7 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Dictionary<string, object> curData = new Dictionary<string, object>();
|
|
|
curData.Add("Name", subdata.Name); //名称
|
|
|
curData.Add("Id", subdata.Id); //Id
|
|
|
+ curData.Add("BrandId", subdata.BrandId); //品牌(0 银联 1 好哒)
|
|
|
curData.Add("CreateDate", subdata.CreateDate == null ? "" : subdata.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //CreateDate
|
|
|
curData.Add("SubjectType", 1); //主体类型
|
|
|
dataList.Add(curData);
|