调整平台帐号平台余额报表

Bailun.DC.Web/Areas/Reports/Controllers/FinanceController.cs

@@ -4031,7 +4031,7 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
 
             var services = new Services.FinanceReportServices();
             var total = 0;
-            var list = services.ListCount(day, platformname, request.pageIndex, request.limit, request.sort, request.order, ref total);
+            var list = services.ListCount(day, platformname, request.pageIndex, 1000, request.sort, request.order, ref total);
 
             var countM = services.ListCounts(day, platformname);
 
@@ -4047,10 +4047,22 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
             countM.withdraw_amount = Math.Round(countM.withdraw_amount, 2, MidpointRounding.AwayFromZero);
 
 
+            //对展示结果排序
+            var listTemp = new List<dc_platform_balance>();
+
+            listTemp.AddRange(list.Where(a => a.platformcode.ToLower() == "paypal").OrderByDescending(p=>p.amount_rmb));
+            listTemp.AddRange(list.Where(a => a.platformcode.ToLower() == "速卖通").OrderByDescending(p => p.amount_rmb));
+            listTemp.AddRange(list.Where(a => a.platformcode.ToLower() == "payoneer").OrderByDescending(p => p.amount_rmb));
+            listTemp.AddRange(list.Where(a => a.platformcode.ToLower() == "beepay").OrderByDescending(p => p.amount_rmb));
+            listTemp.AddRange(list.Where(a => a.platformcode.ToLower() == "pingpong").OrderByDescending(p => p.amount_rmb));
+
+            listTemp.AddRange(list.Where(a => !(listTemp.Select(b => b.platformcode).Contains(a.platformcode))));
+
             //pagination.records = total;
             //pagination.total = total / pagination.rows + (total % pagination.rows > 0 ? 1 : 0);
-
-            var obj = list.Select(p => new {
+            var i = 1;
+            var obj = listTemp.Select(p => new {
+                r = (i++),
                 day = p.day.ToString("yyyy-MM-dd"),
                 p.account,
                 p.currency,
@@ -4065,9 +4077,12 @@ namespace Bailun.DC.Web.Areas.Reports.Controllers
                 p.platformname,
                 puttime = p.day.ToString("yyyy-MM-dd")
             });
+
+            
+
             
             return JsonConvert.SerializeObject(new {
-                total = obj.Count(),
+                total = request.limit,
                 rows = obj,
                 count_row =countM,
                 uid = user!=null?user.GetUid():0,

Bailun.DC.Web/Areas/Reports/Views/Finance/ListAccoutBalanceCount.cshtml

@@ -56,6 +56,8 @@
         .webuploader-container {
             background-color: cornflowerblue !important;
         }
+
+        .pagination-detail{display:none !important;}
     </style>
 }
 
@@ -77,6 +79,7 @@
 
         function list() {
             var columns = [
+                { field: 'r',title:'行数',width:'80'},
                 { field: 'day', title: '统计日期', width: '120' },
                 { field: 'platformname', title: '平台名称', width: '120', sortable: false, iscount: true  },
                 { field: 'account', title: '帐号数', width: '100', sortable: true, iscount: true },

Bailun.DC.Web/Controllers/HomeController.cs

@@ -58,7 +58,7 @@ namespace Bailun.DC.Web.Controllers
         public ActionResult Main()
         {
 #if DEBUG
-            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjE4MWU5NzNjODkzNzFhNTI5N2FmYWI1MTQ0NTdmODQzIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTI5NjIwNTcsImV4cCI6MTU5Mjk5ODA1NywiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkyOTYyMDU3LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.Ox1IfWeTNmsYvrb43TL1ce7iUFm8VgCG7z-UqE4Hadit-94NdLKw-xFttXyHbsp8cI7q0efS1CSDPHnB__4mVcmrfLnr_tb9plaM4sd2btRprdD-L92QW-SuvWeoYuf_zQjN9M433ZUEC_WvJGO2Mo_EptqrU2FqC0AmdmkAeNWqMSeICAvDtQuGZd_jKhou8sJIHoUeboDz0_qmndmLMjx8xGcGrI24858BBDrFNfKlfsggYw-J9D92j6VHYp6hG8YSmrMdTCoqnvoxHdrzr1OsrhspM35DO3e07tlPXBrzTSqvrNbbY3ct7WMvv4EZNxgUbGuAm8toLyJM_9mhFA";
+            var cookie = "Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjE4MWU5NzNjODkzNzFhNTI5N2FmYWI1MTQ0NTdmODQzIiwidHlwIjoiSldUIn0.eyJuYmYiOjE1OTMzMDk0OTUsImV4cCI6MTU5MzM0NTQ5NSwiaXNzIjoiaHR0cDovL2xvY2FsaG9zdDo1MDAxIiwiYXVkIjpbImh0dHA6Ly9sb2NhbGhvc3Q6NTAwMS9yZXNvdXJjZXMiLCJiYWlsdW5BcGkiXSwiY2xpZW50X2lkIjoiYmFpbHVuQ2xpZW50Iiwic3ViIjoi5YWz5oyv5bGxIiwiYXV0aF90aW1lIjoxNTkzMzA5NDk1LCJpZHAiOiJsb2NhbCIsIlVzZXJJZCI6IjIzNDYiLCJzdWNlc3NzIjoidHJ1ZSIsIkNvbXBhbnkiOiJ7XCJJZFwiOjEsXCJDb21wYW55Q29kZVwiOlwiYmFpbHVuXCIsXCJDb21wYW55TmFtZVwiOlwi5bm_5bee55m-5Lym5L6b5bqU6ZO-5pyJ6ZmQ5YWs5Y-4XCJ9IiwiQWxsQ29tcGFueSI6IkZhbHNlIiwiVXNlckNvZGVOZXciOiJCTDExNjkiLCJVc2VyQ29kZSI6IkJMMTE3MCIsIk9hVXNlcklkIjoiMjM0NiIsInJvbGVzIjoiW3tcIklkXCI6MSxcIlJvbGVDb2RlXCI6XCJJVFwiLFwiUm9sZU5hbWVcIjpcIuezu-e7n-euoeeQhuWRmFwifSx7XCJJZFwiOjI4LFwiUm9sZUNvZGVcIjpcInBwc19lZGl0b3JcIixcIlJvbGVOYW1lXCI6XCLkuqflk4HotYTmlpnlkZhcIn0se1wiSWRcIjozNjgsXCJSb2xlQ29kZVwiOlwib21zX2FkbWluXCIsXCJSb2xlTmFtZVwiOlwib21zX-euoeeQhuWRmFwifSx7XCJJZFwiOjM3MCxcIlJvbGVDb2RlXCI6XCJvbXNfbm9ybWFsXCIsXCJSb2xlTmFtZVwiOlwib21z5pmu6YCa5Lq65ZGYXCJ9LHtcIklkXCI6NTUyLFwiUm9sZUNvZGVcIjpcIkJJX1N1cHBsaWVyX1RyYW5jYXRpb25cIixcIlJvbGVOYW1lXCI6XCLkvpvlupTllYblvoDmnaVcIn0se1wiSWRcIjo1NzAsXCJSb2xlQ29kZVwiOlwiY2FzaGllcl9uZXdcIixcIlJvbGVOYW1lXCI6XCLotKLliqHnrqHnkIbns7vnu5_op5LoibJcIn0se1wiSWRcIjo1NzEsXCJSb2xlQ29kZVwiOlwiY3dfYnNpY3NcIixcIlJvbGVOYW1lXCI6XCLotKLliqHln7rnoYDmnYPpmZBcIn0se1wiSWRcIjo1NzIsXCJSb2xlQ29kZVwiOlwiY3dfYWRtaW4xXCIsXCJSb2xlTmFtZVwiOlwi6LSi5Yqh566h55CG5LiA57qn5p2D6ZmQXCJ9LHtcIklkXCI6NTgwLFwiUm9sZUNvZGVcIjpcImN3X3Rlc3RcIixcIlJvbGVOYW1lXCI6XCLotKLliqHmtYvor5VcIn0se1wiSWRcIjo3MTMsXCJSb2xlQ29kZVwiOlwiZmVlX29yZGluYXJ5XCIsXCJSb2xlTmFtZVwiOlwi6LS555So57O757ufLeaZrumAmuS6uuWRmFwifV0iLCJEZXBhcnRtZW50Ijoie1wiRGVwYXJ0bWVudElkXCI6MjU4LFwiTmFtZVwiOlwi5pWw5o2u5Lit5b-DXCIsXCJDb2RlXCI6XCJcIn0iLCJzY29wZSI6WyJvcGVuaWQiLCJwcm9maWxlIiwiYmFpbHVuQXBpIl0sImFtciI6WyJjdXN0b20iXX0.rKBchgs41bEzxuJ6rA3cgPO90DN09euOTD1Mt8pjg-G9Cw6-eoDda0538GQ4KWLxfrSe8NON2jPLOpK1BhMbHbWqO_HIj2pOAYlYTnf-cKH21-3OrN1dXnScBidxDvOSlYz-3sKpVRVRjVZPjuLkuBowuP0NcEElrg_Zh_f3wLOtipkXpIJrzWld8Qm3nd0WmLUwlYXCPwKGX2u1QxEPS9DgKGgH5aEOsnRxiwrfphdlpYEVG8FlLp3rJejGFcPGD01BIf9ohdMaUEdAR5tRQB1TsNfix_H1UZugKtLK3FqLbGd53MfyntO5L6OYEyzHp0-nk69j2oatPP-c7j2mJA";
 #else
             //var user = Common.HttpHelper.NetHelper.Request("http://sso.bailuntec.com/GetUserResource");
             var cookie = HttpContext.Request.Cookies["BailunToken"];