Merge branch 'feature-dgy-盟主列表导出和服务费查询' into feature-dgy-后台测试

Areas/Admin/Controllers/MainServer/LeaderReserveRecordController.cs

@@ -253,7 +253,7 @@ namespace MySystem.Areas.Admin.Controllers
                 condition += " and SeoKeyword='" + SeoKeyword + "'";
             }
 
-            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("LeaderReserveRecord", Fields, "Id desc", "0", 1, 20000, condition, "UserId,SeoTitle,CreateDate,Remark,BeforeAmt,AfterAmt", false);
+            Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("LeaderReserveRecord", Fields, "Id desc", "0", 1, 20000, condition, "Id,UserId,SeoTitle,CreateDate,Remark", false);
             List<Dictionary<string, object>> diclist = obj["data"] as List<Dictionary<string, object>>;
             foreach (Dictionary<string, object> dic in diclist)
             {
@@ -265,6 +265,11 @@ namespace MySystem.Areas.Admin.Controllers
                 dic["UserIdRealName"] = userid_Users.RealName;
                 dic["LeaderBalanceAmount"] = userAccount.LeaderBalanceAmount;
                 dic.Remove("UserId");
+                int Id = int.Parse(function.CheckInt(dic["Id"].ToString()));
+                var leaderReserveRecord = db.LeaderReserveRecord.FirstOrDefault(m => m.Id == Id) ?? new LeaderReserveRecord();
+                dic["BeforeAmount"] = leaderReserveRecord.BeforeAmt;
+                dic["AfterAmount"] = leaderReserveRecord.AfterAmt;
+                dic.Remove("Id");
 
                 // //盟主等级
                 // int LeaderLevel = userid_Users.LeaderLevel;
@@ -308,8 +313,8 @@ namespace MySystem.Areas.Admin.Controllers
             ReturnFields.Add("dPosCoupons", "电签兑换券张数");
             ReturnFields.Add("bPosCoupons", "大POS兑换券张数");
             ReturnFields.Add("LeaderBalanceAmount", "可提现余额");
-            ReturnFields.Add("BeforeAmt", "使用前剩余额度");
-            ReturnFields.Add("AfterAmt", "使用后剩余额度");
+            ReturnFields.Add("BeforeAmount", "使用前剩余额度");
+            ReturnFields.Add("AfterAmount", "使用后剩余额度");
 
             result.Add("Fields", ReturnFields);
             AddSysLog("0", "Leaders", "ExportExcel");