|
@@ -42,6 +42,7 @@ namespace MySystem
|
|
|
curData.Add("WeChatInFactAmount", decimal.Parse(subdata["WeChatInfactAmount"].ToString()).ToString("f2"));
|
|
|
curData.Add("AliPayInFactAmount", decimal.Parse(subdata["AliPayInFactAmount"].ToString()).ToString("f2"));
|
|
|
curData.Add("OrderCount", subdata["OderCount"].ToString());
|
|
|
+ curData.Add("Kind", 2);
|
|
|
dataList.Add(curData);
|
|
|
}
|
|
|
return dataList;
|
|
@@ -100,6 +101,7 @@ namespace MySystem
|
|
|
curData.Add("PayMode", subdata["PayMode"].ToString());
|
|
|
curData.Add("IsAct", subdata["IsAct"].ToString());
|
|
|
curData.Add("PayMoney", decimal.Parse(subdata["PayMoney"].ToString()).ToString("f2"));
|
|
|
+ curData.Add("Kind", 2);
|
|
|
dataList.Add(curData);
|
|
|
}
|
|
|
return dataList;
|
|
@@ -125,6 +127,7 @@ namespace MySystem
|
|
|
obj.Add("PayMoney", decimal.Parse(subdata["PayMoney"].ToString()).ToString("f2"));
|
|
|
obj.Add("IsAct", subdata["IsAct"].ToString());
|
|
|
obj.Add("OrderNo", subdata["OrderNo"].ToString());
|
|
|
+ obj.Add("Kind", 2);
|
|
|
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);
|