|
|
@@ -29,10 +29,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
{
|
|
|
value = PublicFunction.DesDecrypt(value);
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
- List<Dictionary<string, object>> dataList = UnionPayMerchantParamSetRecordListDo(value);
|
|
|
- return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
|
|
|
+ Dictionary<string, object> Other = new Dictionary<string, object>();
|
|
|
+ List<Dictionary<string, object>> dataList = UnionPayMerchantParamSetRecordListDo(value, out Other);
|
|
|
+ return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList, Other = Other });
|
|
|
}
|
|
|
- private List<Dictionary<string, object>> UnionPayMerchantParamSetRecordListDo(string value)
|
|
|
+ private List<Dictionary<string, object>> UnionPayMerchantParamSetRecordListDo(string value, out Dictionary<string, object> Other)
|
|
|
{
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
string MerchantId = data["MerchantId"].ToString(); //商户Id
|
|
|
@@ -44,8 +45,10 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
condition += " and MerchantId='" + MerchantId + "'";
|
|
|
}
|
|
|
List<RelationData> relationData = new List<RelationData>();
|
|
|
+ Other = new Dictionary<string, object>();
|
|
|
+ int count = 0;
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
- List<Dictionary<string, object>> source = MerchantParamSetRecordService.List(relationData, condition, pageNum, pageSize);
|
|
|
+ List<Dictionary<string, object>> source = MerchantParamSetRecordService.List(relationData, condition, out count, pageNum, pageSize);
|
|
|
var merSet = MerchantParamSetService.Query(int.Parse(MerchantId));
|
|
|
foreach (Dictionary<string, object> subdata in source)
|
|
|
{
|
|
|
@@ -79,6 +82,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
|
|
|
|
|
|
dataList.Add(curData);
|
|
|
}
|
|
|
+ Other.Add("Count", count); //总数
|
|
|
return dataList;
|
|
|
}
|
|
|
#endregion
|