|
@@ -185,7 +185,7 @@ namespace MySystem
|
|
|
obj.Add("MerchantName", MerchantInfoService.Query(int.Parse(subdata["MerchantId"].ToString())).Name); //交易门店
|
|
|
|
|
|
List<Dictionary<string, object>> dataList = new List<Dictionary<string, object>>();
|
|
|
- List<Dictionary<string, object>> dics = ConsumerProfitService.List(relationData, " and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);
|
|
|
+ List<Dictionary<string, object>> dics = ConsumerProfitService.List(relationData, " and Sort=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);
|
|
|
foreach (Dictionary<string, object> dic in dics)
|
|
|
{
|
|
|
Dictionary<string, object> cdata = new Dictionary<string, object>();
|
|
@@ -196,10 +196,10 @@ namespace MySystem
|
|
|
dataList.Add(cdata);
|
|
|
}
|
|
|
obj.Add("ProfitList", dataList); //订单分红记录列表
|
|
|
- obj.Add("ProfitTotalAmount", ConsumerProfitService.Sum(" OrderId=" + int.Parse(subdata["Id"].ToString()) + "", "GetMoney").ToString("f2")); //分红总金额
|
|
|
+ obj.Add("ProfitTotalAmount", ConsumerProfitService.Sum(" Sort=" + int.Parse(subdata["Id"].ToString()) + "", "GetMoney").ToString("f2")); //分红总金额
|
|
|
|
|
|
List<Dictionary<string, object>> dataList2 = new List<Dictionary<string, object>>();
|
|
|
- List<Dictionary<string, object>> dics2 = ConsumerProfitService.List(relationData, " and Sort=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);
|
|
|
+ List<Dictionary<string, object>> dics2 = ConsumerProfitService.List(relationData, " and OrderId=" + int.Parse(subdata["Id"].ToString()) + "", 1, 999);
|
|
|
foreach (Dictionary<string, object> dic in dics2)
|
|
|
{
|
|
|
Dictionary<string, object> cdata = new Dictionary<string, object>();
|
|
@@ -210,7 +210,7 @@ namespace MySystem
|
|
|
dataList2.Add(cdata);
|
|
|
}
|
|
|
obj.Add("ProfitList2", dataList2); //订单分红记录列表
|
|
|
- obj.Add("ProfitTotalAmount2", ConsumerProfitService.Sum(" Sort=" + int.Parse(subdata["Id"].ToString()) + "", "GetMoney").ToString("f2")); //分红总金额
|
|
|
+ obj.Add("ProfitTotalAmount2", ConsumerProfitService.Sum(" OrderId=" + int.Parse(subdata["Id"].ToString()) + "", "GetMoney").ToString("f2")); //分红总金额
|
|
|
}
|
|
|
return obj;
|
|
|
}
|