|
|
@@ -123,7 +123,7 @@ namespace MySystem
|
|
|
obj.Add("PayMoney", subdata["PayMoney"].ToString()); //支付金额
|
|
|
obj.Add("IsAct", subdata["IsAct"].ToString()); //是否活动(1 是 0 否)
|
|
|
obj.Add("OrderNo", subdata["OrderNo"].ToString()); //订单号
|
|
|
- obj.Add("MerchantName", subdata["MerchantName"].ToString()); //交易门店
|
|
|
+ obj.Add("MerchantName", MerchantInfoService.Query(int.Parse(subdata["MerchantId"].ToString())).Name); //交易门店
|
|
|
Dictionary<string, object> cdata = new Dictionary<string, object>();
|
|
|
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);
|
