|
@@ -87,12 +87,12 @@ namespace MySystem.Areas.Api.Controllers.v1
|
|
|
Obj.Add("Machine2", Machine2); //机具管理数据
|
|
|
|
|
|
Dictionary<string, object> Profit = new Dictionary<string, object>();
|
|
|
- Profit.Add("TradeProfit", MachineData.TradeProfit); //交易分润
|
|
|
- Profit.Add("ActProfit", MachineData.ActProfit); //激活奖励
|
|
|
- Profit.Add("OpenProfit", MachineData.OpenProfit); //开机奖励
|
|
|
- Profit.Add("DividendsProfit", MachineData.DividendsProfit); //分红奖励
|
|
|
- Profit.Add("OtherProfit", MachineData.OtherProfit); //分润补贴
|
|
|
- Profit.Add("FluxProfit", MachineData.FluxProfit); //流量卡分佣
|
|
|
+ Profit.Add("TradeProfit", MachineData2.TradeProfit); //交易分润
|
|
|
+ Profit.Add("ActProfit", MachineData2.ActProfit); //激活奖励
|
|
|
+ Profit.Add("OpenProfit", MachineData2.OpenProfit); //开机奖励
|
|
|
+ Profit.Add("DividendsProfit", MachineData2.DividendsProfit); //分红奖励
|
|
|
+ Profit.Add("OtherProfit", MachineData2.OtherProfit); //分润补贴
|
|
|
+ Profit.Add("FluxProfit", MachineData2.FluxProfit); //流量卡分佣
|
|
|
Obj.Add("Profit", Profit); //收益查看数据
|
|
|
|
|
|
List<Dictionary<string, object>> Advertisment = new List<Dictionary<string, object>>();
|