新增：联盟预计收益；

修复：cookie续期bug；

.gitignore

@@ -0,0 +1,28 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+stats.html
+
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
+
+# Misc
+.DS_Store
+.vs
+**/bin/
+**/obj/Debug/

molilian.api/Controllers/admin/TaobaoController.cs

@@ -29,6 +29,11 @@ namespace molilian.api.Controllers
         }
 
 
+        /// <summary>
+        /// 账号列表
+        /// </summary>
+        /// <param name="form"></param>
+        /// <returns></returns>
         [HttpPost]
         public ActionResult list([FromBody] JsonElement form)
         {
@@ -95,6 +100,7 @@ namespace molilian.api.Controllers
             foreach (var item in result.List)
             {
                 item.current_amt = Math.Round(TkPoolCore.GetIncomeAmt(item.name), 2);
+                item.cookies = string.Empty;
             }
             return new APIResult(new { data = result });
         }
@@ -110,14 +116,9 @@ namespace molilian.api.Controllers
             string order = form.Read<string>("order");
 
             var report_date = form.PathReadArray<string>("query_date[]");
-            var accountName = form.Read("accountName", string.Empty);
             string dailys_accountName = "all";
 
             string filter = string.Empty;
-            if (!string.IsNullOrEmpty(accountName))
-            {
-                filter += $" AND A.accountName=@accountName";
-            }
             DateTime stime = DateTime.MinValue, etime = DateTime.MinValue;
             if (report_date.Count == 2)
             {
@@ -145,7 +146,7 @@ namespace molilian.api.Controllers
                 .LeftJoin("daily_logs",
                 "B.log_date = A.report_date AND B.accountName=@dailys_accountName",
                 "total_count, B.abandon_count, B.success_count, B.abandon_percentage, B.success_percentage")
-                .Where(filter, new { accountName, dailys_accountName, stime, etime })
+                .Where(filter, new { dailys_accountName, stime, etime })
                 .Page(size, page)
                 .Order(orderBy)
                 .PageList<TkReportDTO>(getTotal);
@@ -396,5 +397,109 @@ namespace molilian.api.Controllers
             //    RedisHelper.IncrBy($":total:{accountName}:{reason}:{DateTime.Now:yyyyMMddHH}");
             //}
         }
+
+
+
+        [HttpPost]
+        public ActionResult settle_bills_total([FromBody] JsonElement form)
+        {
+            int page = form.Read("current", 1);
+            int size = form.Read("pageSize", 10);
+            bool getTotal = form.Read("getTotal", true);
+            string sort = form.Read<string>("sort");
+            string order = form.Read<string>("order");
+
+            var belongTime = form.PathReadArray<string>("query_date[]");
+
+            string filter = string.Empty;
+            DateTime stime = DateTime.MinValue, etime = DateTime.MinValue;
+            if (belongTime.Count == 2)
+            {
+                if (DateTime.TryParse(belongTime[0], out stime) && DateTime.TryParse(belongTime[1], out etime))
+                {
+                    etime = etime.AddDays(1).AddSeconds(-1);
+                    filter += $" AND belongTime BETWEEN @stime AND @etime";
+                }
+            }
+
+            filter = filter.StringTrimStart(" AND ");
+
+            //排序
+            string orderBy = "belongTime DESC";
+            if (!string.IsNullOrEmpty(order))
+            {
+                order = "descending".Equals(order) ? "DESC" : "ASC";
+                orderBy = sort switch
+                {
+                    _ => $"{sort} {order}",
+                };
+            }
+            var result = new DBContext.Table("v_tk_report_bills")
+                .Where(filter, new { stime, etime })
+                .Page(size, page)
+                .Order(orderBy)
+                .PageList<TkSettleBillDTO>(getTotal);
+
+            return new APIResult(new { data = result });
+        }
+
+
+        [HttpPost]
+        public ActionResult settle_bills([FromBody] JsonElement form)
+        {
+            int page = form.Read("current", 1);
+            int size = form.Read("pageSize", 10);
+            bool getTotal = form.Read("getTotal", true);
+            string sort = form.Read<string>("sort");
+            string order = form.Read<string>("order");
+            string name = form.Read<string>("keyword");
+
+            var belongTime = form.PathReadArray<string>("query_date[]");
+
+            string filter = string.Empty;
+            if (!string.IsNullOrEmpty(name))
+            {
+                filter += $" AND accountId IN (SELECT ID FROM tk_pool WHERE company=@name)";
+            }
+            DateTime stime = DateTime.MinValue, etime = DateTime.MinValue;
+            if (belongTime.Count == 2)
+            {
+                if (DateTime.TryParse(belongTime[0], out stime) && DateTime.TryParse(belongTime[1], out etime))
+                {
+                    etime = etime.AddDays(1).AddSeconds(-1);
+                    filter += $" AND belongTime BETWEEN @stime AND @etime";
+                }
+            }
+
+            filter = filter.StringTrimStart(" AND ");
+
+            //排序
+            string orderBy = "belongTime DESC";
+            if (!string.IsNullOrEmpty(order))
+            {
+                order = "descending".Equals(order) ? "DESC" : "ASC";
+                orderBy = sort switch
+                {
+                    _ => $"{sort} {order}",
+                };
+            }
+
+            var result = new DBContext.Table("tk_settle_bill")
+                .Where(filter, new { name, stime, etime })
+                .Page(size, page)
+                .Order(orderBy)
+                .PageList<TkSettleBillDTO>(getTotal);
+
+
+            //foreach (var item in result.List)
+            //{
+            //    if (string.IsNullOrEmpty(name))
+            //    {
+            //        item.accountName = "-";
+            //    }
+            //}
+            return new APIResult(new { data = result });
+        }
+
     }
 }

molilian.api/Controllers/public/TaskController.cs

@@ -26,6 +26,40 @@ namespace molilian.api.Controllers
             return new APIResult(new { success = true, message = "ok" });
         }
 
+
+        [HttpGet]
+        public async Task<ActionResult> GetSettleBills(int sleep = 2000)
+        {
+            var list = TkPoolCore.List();
+            if (list == null) return new APIResult(new { success = false, message = "没有有效账号", });
+
+            string message = string.Empty;
+            int total = 0;
+            foreach (var account in list)
+            {
+#if DEBUG
+                if (13 != account.id) continue;
+#endif
+                try
+                {
+                    var alimama = new AlimamaPlus(account);
+                    total += alimama.GetSettleBills(sleep);
+                }
+                catch (Exception ex)
+                {
+                    message = $"【收益接口异常】\t{account.name}\n{ex.Message}\n{ex.StackTrace}";
+                    NotifyCore.Notify(new NifyMessage
+                    {
+                        message = message,
+                        priority = NifyMessagePriority.high,
+                        tags = ["red_circle"]
+                    });
+                    continue;
+                }
+            }
+            return new APIResult(new { success = true, message = "ok", total });
+        }
+
         [HttpGet]
         public async Task<ActionResult> GetHistoryOrders(int id, int sleep = 2000)
         {
@@ -59,6 +93,7 @@ namespace molilian.api.Controllers
             }
             return new APIResult(new { success = true, message = "ok", total });
         }
+
         [HttpGet]
         public async Task<ActionResult> GetIncyOrders(int sleep = 2000)
         {

molilian.api/Properties/PublishProfiles/https___ccr.ccs.tencentyun.com_shaobin.pubxml.user

@@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 <Project>
   <PropertyGroup>
     <TimeStampOfAssociatedLegacyPublishXmlFile />
-    <History>True|2024-05-31T10:50:23.9756041Z;True|2024-05-30T02:35:55.0365301+08:00;True|2024-05-30T01:33:28.8061432+08:00;False|2024-05-30T01:29:34.0129550+08:00;True|2024-05-30T01:23:20.3030349+08:00;False|2024-05-30T01:17:18.1241207+08:00;True|2024-05-30T01:10:17.8305588+08:00;True|2024-05-28T18:54:19.3394105+08:00;True|2024-05-28T18:39:34.9758850+08:00;True|2024-05-28T18:09:29.9892839+08:00;True|2024-05-27T23:52:48.3818652+08:00;True|2024-05-24T14:41:21.1021888+08:00;True|2024-05-23T15:37:16.0345242+08:00;True|2024-05-22T23:38:36.5655830+08:00;True|2024-05-22T22:03:57.2780660+08:00;True|2024-05-22T21:52:22.2696242+08:00;True|2024-05-22T20:09:51.6806573+08:00;False|2024-05-21T22:57:22.6468456+08:00;False|2024-05-21T22:56:04.2196346+08:00;False|2024-05-21T22:54:15.6508138+08:00;False|2024-05-21T14:51:18.1140090+08:00;False|2024-05-21T14:50:56.1160123+08:00;True|2024-05-21T02:51:40.6380703+08:00;True|2024-05-21T02:44:50.6881192+08:00;True|2024-05-17T02:27:08.3785244+08:00;True|2024-05-16T16:01:05.5724934+08:00;False|2024-05-16T14:40:35.7848348+08:00;True|2024-05-15T00:51:56.7872132+08:00;True|2024-05-14T17:10:52.0615828+08:00;True|2024-05-14T16:39:39.7256770+08:00;True|2024-05-11T23:53:02.8084114+08:00;True|2024-05-11T14:22:07.5683120+08:00;True|2024-05-11T12:21:19.0229784+08:00;True|2024-05-11T12:04:15.4285324+08:00;True|2024-05-11T02:14:35.6662897+08:00;True|2024-05-11T02:08:01.0318965+08:00;False|2024-05-11T02:05:04.4105484+08:00;True|2024-05-11T00:13:08.7831755+08:00;True|2024-05-04T16:53:43.3538176+08:00;False|2024-05-04T16:38:25.0193125+08:00;False|2024-05-04T16:38:20.7562182+08:00;</History>
+    <History>True|2024-06-06T18:58:23.2244952Z||;True|2024-06-07T01:22:30.7386593+08:00||;True|2024-06-06T19:04:12.6541924+08:00||;True|2024-05-31T18:50:23.9756041+08:00||;True|2024-05-30T02:35:55.0365301+08:00||;True|2024-05-30T01:33:28.8061432+08:00||;False|2024-05-30T01:29:34.0129550+08:00||;True|2024-05-30T01:23:20.3030349+08:00||;False|2024-05-30T01:17:18.1241207+08:00||;True|2024-05-30T01:10:17.8305588+08:00||;True|2024-05-28T18:54:19.3394105+08:00||;True|2024-05-28T18:39:34.9758850+08:00||;True|2024-05-28T18:09:29.9892839+08:00||;True|2024-05-27T23:52:48.3818652+08:00||;True|2024-05-24T14:41:21.1021888+08:00||;True|2024-05-23T15:37:16.0345242+08:00||;True|2024-05-22T23:38:36.5655830+08:00||;True|2024-05-22T22:03:57.2780660+08:00||;True|2024-05-22T21:52:22.2696242+08:00||;True|2024-05-22T20:09:51.6806573+08:00||;False|2024-05-21T22:57:22.6468456+08:00||;False|2024-05-21T22:56:04.2196346+08:00||;False|2024-05-21T22:54:15.6508138+08:00||;False|2024-05-21T14:51:18.1140090+08:00||;False|2024-05-21T14:50:56.1160123+08:00||;True|2024-05-21T02:51:40.6380703+08:00||;True|2024-05-21T02:44:50.6881192+08:00||;True|2024-05-17T02:27:08.3785244+08:00||;True|2024-05-16T16:01:05.5724934+08:00||;False|2024-05-16T14:40:35.7848348+08:00||;True|2024-05-15T00:51:56.7872132+08:00||;True|2024-05-14T17:10:52.0615828+08:00||;True|2024-05-14T16:39:39.7256770+08:00||;True|2024-05-11T23:53:02.8084114+08:00||;True|2024-05-11T14:22:07.5683120+08:00||;True|2024-05-11T12:21:19.0229784+08:00||;True|2024-05-11T12:04:15.4285324+08:00||;True|2024-05-11T02:14:35.6662897+08:00||;True|2024-05-11T02:08:01.0318965+08:00||;False|2024-05-11T02:05:04.4105484+08:00||;True|2024-05-11T00:13:08.7831755+08:00||;True|2024-05-04T16:53:43.3538176+08:00||;False|2024-05-04T16:38:25.0193125+08:00||;False|2024-05-04T16:38:20.7562182+08:00||;</History>
     <LastFailureDetails>
     </LastFailureDetails>
   </PropertyGroup>

molilian.api/obj/Container/AbsoluteOutputAssemblyPath.cache

@@ -0,0 +1 @@
+molilian.api.dll

molilian.api/obj/Container/ContainerCreationResult.cache

@@ -0,0 +1 @@
+Skipped

molilian.api/obj/Container/ContainerDevelopmentMode.cache

@@ -0,0 +1 @@
+Regular

molilian.api/obj/Container/ContainerOperatingSystemFlavor.cache

@@ -0,0 +1 @@
+Unknown

molilian.api/obj/Container/ImageBuildContext.cache

@@ -0,0 +1 @@
+pTYMv18PnIArDqilvn7CrPaAwwwGs+cZ8JwYfh1wNP8=

molilian.api/obj/Container/ImageId.cache

@@ -0,0 +1 @@
+sha256:13a52217501feb9c6315b55f6eaa02611741fd01e1322065cc5e06f0dce02eaf

molilian.api/obj/Container/OperatingSystemName.cache

@@ -0,0 +1 @@
+Linux

molilian.api/obj/Container/TargetFramework.cache

@@ -0,0 +1 @@
+DotNetCore

molilian.api/obj/Debug/net8.0/molilian.api.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+202f1661ece39a6a626434563e300fa86dc365a6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8e14776ffb15d944852bf020eea073160febd28")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.api/obj/Debug/net8.0/molilian.api.AssemblyInfoInputs.cache

@@ -1 +1 @@
-c36f8f1c1ff793c9914677a6fa681b132c00d3c160adcc67d56de6652a860077
+ba1c9ad91ae07cc27ee8df1570b05df7173e8943795dd1d8a8303ef86c0ce17a

molilian.api/obj/Debug/net8.0/molilian.api.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-fa705c7e22bcd1450473f81b1f59806fb53772bb56880bfbc33e85cd08f871e2
+7137abc7afe76216925cf78bdd00b709f8927aeeeb427b27f90bef5b86220811

molilian.api/obj/Debug/net8.0/molilian.api.csproj.FileListAbsolute.txt

@@ -68,7 +68,6 @@ E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\staticwebassets\ms
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\staticwebassets\msbuild.buildTransitive.molilian.api.props
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\staticwebassets.pack.json
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\scopedcss\bundle\molilian.api.styles.css
-E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.api.csproj.CopyComplete
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\refint\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.api.pdb
@@ -76,3 +75,4 @@ E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.api.genru
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\ref\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\bin\Debug\net8.0\IP2Region.Net.dll
 E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.api.MvcApplicationPartsAssemblyInfo.cs
+E:\project\2024\molilian\server\molilian.api\obj\Debug\net8.0\molilian.851FB5E8.Up2Date

molilian.api/obj/Release/net8.0/molilian.api.AssemblyInfo.cs

@@ -15,7 +15,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+202f1661ece39a6a626434563e300fa86dc365a6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8e14776ffb15d944852bf020eea073160febd28")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.api")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.api/obj/Release/net8.0/molilian.api.AssemblyInfoInputs.cache

@@ -1 +1 @@
-7c89b9b76e260925b8f66bdc3132930b38f7a670a47e77c0314ad0fb16bb7783
+2babe4355fdace8885357923b7ded2f3c391cb2100470ec32705f60e64737c34

molilian.api/obj/Release/net8.0/molilian.api.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-e0463da11af667ba14c7b168633c49e56ded49d761ec47632258214e1db0cdf8
+60d42f8dc6948ff414ff179948443ff62b7781061216fb4bf8a1bd862d750937

molilian.api/obj/Release/net8.0/molilian.api.csproj.FileListAbsolute.txt

@@ -69,10 +69,10 @@ E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\staticwebassets\
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\staticwebassets\msbuild.buildTransitive.molilian.api.props
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\staticwebassets.pack.json
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\scopedcss\bundle\molilian.api.styles.css
-E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\molilian.api.csproj.CopyComplete
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\refint\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\molilian.api.pdb
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\molilian.api.genruntimeconfig.cache
 E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\ref\molilian.api.dll
 E:\project\2024\molilian\server\molilian.api\bin\Release\net8.0\IP2Region.Net.dll
+E:\project\2024\molilian\server\molilian.api\obj\Release\net8.0\molilian.851FB5E8.Up2Date

molilian.api/obj/molilian.api.csproj.nuget.dgspec.json

@@ -21,6 +21,7 @@
           "net8.0"
         ],
         "sources": {
+          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -37,6 +38,11 @@
           "warnAsError": [
             "NU1605"
           ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
         }
       },
       "frameworks": {
@@ -75,7 +81,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
         }
       }
     },
@@ -96,6 +102,7 @@
           "net8.0"
         ],
         "sources": {
+          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -108,6 +115,11 @@
           "warnAsError": [
             "NU1605"
           ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
         }
       },
       "frameworks": {
@@ -151,7 +163,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

molilian.api/obj/molilian.api.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.10.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />

molilian.api/obj/project.assets.json

@@ -3954,6 +3954,7 @@
         "net8.0"
       ],
       "sources": {
+        "C:\\Program Files\\dotnet\\library-packs": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -3970,6 +3971,11 @@
         "warnAsError": [
           "NU1605"
         ]
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
       }
     },
     "frameworks": {
@@ -4008,7 +4014,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
       }
     }
   }

molilian.api/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "zVWU0cdibMAyxczKNv5fzX+5kybT5s0dwp0kPXhFVg7S45N9KQjWLFH7BF469+1xgbJV66oeFKkbuagG10Vnjw==",
+  "dgSpecHash": "U/4xUeueZ9w=",
   "success": true,
   "projectFilePath": "E:\\project\\2024\\molilian\\server\\molilian.api\\molilian.api.csproj",
   "expectedPackageFiles": [

molilian.core/Core/taoke/TkPoolCore.cs

@@ -23,7 +23,11 @@ namespace molilian.core
         {
             var list = List();
             if (!list.Any()) return null;
+#if DEBUG
+            return list.Where(e => e.id == 7).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
+#else
             return list.Where(IsNotExceedDailyIncomeLimit).OrderBy(l => Guid.NewGuid()).FirstOrDefault();
+#endif
         }
 
         internal static void SaveIncomeAmt(string accountName, decimal income_amt)
@@ -187,4 +191,3 @@ namespace molilian.core
     }
 
 }
- 

molilian.core/DTO/alimama/TkPoolDTO.cs

@@ -4,6 +4,8 @@
     {
         public int id { get; set; }
         public string name { get; set; } = string.Empty;
+        public string company { get; set; } = string.Empty;
+        public string phone { get; set; } = string.Empty;
         public string description { get; set; } = string.Empty;
         public string tb_token { get; set; } = string.Empty;
         public string floorId { get; set; } = string.Empty;
@@ -19,6 +21,5 @@
         public decimal draw_balance { get; set; } = 0;
         public string api { get; set; } = string.Empty;
         public int api_id { get; set; } = 0;
-
     }
 }

molilian.core/DTO/alimama/TkSettleBillDTO.cs

@@ -0,0 +1,42 @@
+using dodohold.core;
+using System;
+using System.Text.Json.Serialization;
+using static System.Runtime.InteropServices.JavaScript.JSType;
+
+namespace molilian.core
+{
+    [Table("tk_settle_bill")]
+    public class TkSettleBillDTO
+    {
+
+        [Key]
+        public int id { get; set; }
+        public int accountId { get; set; } = 0;
+
+        public string accountName { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 淘客付款时间 
+        /// </summary>
+        [JsonConverter(typeof(DateTimeConverterUsingDateTimeParse))]
+        public DateTime belongTime { get; set; } = DateTime.MinValue;
+
+        public int bizType { get; set; } = 0;
+        public string bizTypeDesc { get; set; } = string.Empty;
+        public string clearingPeriod { get; set; } = string.Empty;
+        public decimal expectedEarnings { get; set; } = 0.0m;
+        public int incomeType { get; set; } = 0;
+        public string incomeTypeDesc { get; set; } = string.Empty;
+        public decimal settleIncomeTotal { get; set; } = 0.0m;
+        public string settleStatus { get; set; } = string.Empty;
+        public decimal dividedIncome { get; set; } = 0.0m;
+        public decimal platformServiceFee { get; set; } = 0.0m;
+
+
+        [IgnoreUpdate]
+        public DateTime create_time { get; set; } = DateTime.Now;
+
+        public DateTime last_time { get; set; } = DateTime.Now;
+    }
+
+}

molilian.core/Plus/Alimama/account.cs

@@ -89,8 +89,10 @@ namespace molilian.core
                     var response = client.Request(url);
                     var body = response.Body();
                 }
-
+                /*
+{"invalidKey":null,"info":{"ok":true,"message":null},"data":{"noLogin":true,"ip":"121.206.54.236","loginUrlPrefix":"http://www.alimama.com/member/login.htm?forward=","env":"product"},"ok":true}                 */
                 {
+
                     string url = "https://pub.alimama.com/openapi/param2/1/gateway.unionpub/union.userLoginInfo.get";
                     var client = new WebClientUtility().SetContentType("application/json;charset=utf-8")
                                 .AddHeaders("X-Requested-With", "XMLHttpRequest")
@@ -112,6 +114,9 @@ namespace molilian.core
                     var response = client.Request(url);
                     var body = response.Body();
                     var root = body.Convert2JsonElement();
+                    /*
+                     {"success":true,"model":{}}
+                     */
 
                     bool success = root.PathRead<bool>("success", true);
                     string msgCode = root.PathRead("msgCode", string.Empty);
@@ -139,6 +144,7 @@ namespace molilian.core
                     var body = response.Body();
                     /*
                      {"success":false,"msgInfo":"用户淘宝未登录","msgCode":"USER_TB_NOT_LOGIN"}
+                    {"model":{"url":"https://www.alimama.com/aso/tvs?domain=taobao&sign_account=670430e31dbb7459635d7db887fbc39b&sign_time=1717670916&token=64616532303JDaxNfPy83okP3kLScwCkGiuMcyC4Pcyn92UtF465646233393431&target=6874747073JDaxNfPy83okP3kLScwCkGiuMcyC4PcynF6D&defaultLoginURL=https%3A%2F%2Flogin.taobao.com%2Fmember%2Flogin.jhtml%3Ffrom%3Dalimama"},"success":true}
                      */
 
                     var root = body.Convert2JsonElement();
@@ -176,6 +182,9 @@ namespace molilian.core
                     if (!string.IsNullOrEmpty(_user_agent)) client.UserAgent = _user_agent;
                     var response = client.Request(url);
                     var body = response.Body();
+                    /*
+                     {"invalidKey":null,"info":{"ok":true,"message":null},"ok":true,"data":{"nnormalGradeLevel":3,"mmNick":"tb628735153169@alimama","hasHighCommPerm":1,"ip":"121.206.54.236","avatar":"//img.alicdn.com/bao/uploaded/i3/6000000006221/O1CN01S9dQzd1vpGrjjldrF_!!6000000006221-0-userheaderimgshow.jpg","userType":1,"env":"product","imgUrlPrefix":"//img.alicdn.com/tfscom","memberid":6172912691,"hasPubPermission":"1","newVersion":1}}
+                     */
                 }
 
                 new DBContext.Table("tk_pool")
@@ -192,7 +201,6 @@ namespace molilian.core
                 });
                 //NotifyCore.AnPushNotify("Cookie更新", $"【淘宝联盟:{_accountName}】cookie 续期");
 
-
                 return (true, string.Empty);
             }
             catch (Exception ex)
@@ -209,7 +217,7 @@ namespace molilian.core
                     tags = ["red_circle"]
                 });
 
-                throw;
+                return (false, "cookie续期异常");
             }
 
         }

molilian.core/Plus/Alimama/bills.cs

@@ -0,0 +1,104 @@
+using dodohold.core;
+using Spire.Pdf.Xmp;
+using System.Data;
+using System.Drawing.Printing;
+using System.Text.Json;
+
+namespace molilian.core
+{
+    public partial class AlimamaPlus
+    {
+        private const string base_bill_url = "https://pub.alimama.com/openapi/param2/1/gateway.unionpub/new.settle.media.pre.income.daily.bill.detail.json";
+        public int GetSettleBills(int sleep)
+        {
+            DateTime startTime = DateTime.Parse("2024-03-01");
+            DateTime endTime = DateTime.Now;
+            // 确保 startTime 小于 endTime
+            if (startTime > endTime)
+            {
+                (startTime, endTime) = (endTime, startTime);
+            }
+
+            int pageNo = 1;
+            string dataVersion = string.Empty;
+            int pageSize = 20;
+
+            bool hasNext = true;
+            int total = 0;
+            while (hasNext)
+            {
+                //        ?t=1717528348646&_tb_token_=576b361b883b8&pageNo=2&pageSize=20&endTime=2024-06-04&startTime=2024-05-05&dataVersion=20240603
+
+                var ts = DateTime.Now.Convert2UnixTimestamp();
+                string url = $"{base_bill_url}?t={ts}&_tb_token_={_tb_token}&pageNo={pageNo}&pageSize={pageSize}&startTime={startTime:yyyy-MM-dd}&endTime={endTime:yyyy-MM-dd}&dataVersion={dataVersion}";
+
+                var client = new WebClientUtility().SetContentType("application/json;charset=utf-8")
+                          .AddHeaders("X-Requested-With", "XMLHttpRequest")
+                          .AddHeaders("Cookie", _cookies);
+#if DEBUG
+#else   
+                client.Proxy = _proxy;
+#endif
+                if (!string.IsNullOrEmpty(_user_agent)) client.UserAgent = _user_agent;
+                var response = client.Request(url);
+
+                if (response.ResponseException != null)
+                {
+                    new LoggerLibrary("api_error", "fail")
+                        .Info(response.ResponseException.Message, response.ResponseException.StackTrace)
+                        .Save();
+                    throw response.ResponseException;
+                }
+                var body = response.Body();
+                JsonElement data;
+                try
+                {
+                    var root = body.Convert2JsonElement();
+                    var succss = root.Read<bool>("success");
+                    data = root.ElementRead("data");
+                    if (!succss)
+                    {
+                        throw new APIException(body);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw new APIException(body);
+                }
+                using var conn = DBContext.GetOpenConnection();
+                conn.Open();
+
+                try
+                {
+                    foreach (var order in data.ElementRead("result").EnumerateArray())
+                    {
+                        TkSettleBillDTO item = order.GetRawText().Convert2Object<TkSettleBillDTO>();
+                        // 处理每个订单数据 
+                        item.accountId = _accountId;
+                        item.accountName = _company;
+                        int? id = conn.Replace(item);
+
+                        total++;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    throw;
+                }
+                finally
+                {
+                    conn.Dispose();
+                }
+                pageNo++;
+                hasNext = data.Read<bool>("hasNext");
+                dataVersion = data.Read<string>("dataVersion");
+
+                if (sleep > 0) Thread.Sleep(sleep);
+            }
+            return total;
+        }
+
+
+
+    }
+}

molilian.core/Plus/Alimama/parse.cs

@@ -12,6 +12,7 @@ namespace molilian.core
 
         private string _accountName;
         private int _accountId;
+        private string _company;
         private string _tb_token;
         private string _floorId;
         private string _refpid;
@@ -29,6 +30,7 @@ namespace molilian.core
 
             _accountId = account.id;
             _accountName = account.name;
+            _company = account.company;
             _tb_token = account.tb_token;
             _floorId = account.floorId;
             _refpid = account.refpid;

molilian.core/Plus/Alimama/parse_2.cs

@@ -476,6 +476,9 @@ namespace molilian.core
 
 
                 body = response.Body();
+                //{"code":601,"info":{"ok":false,"message":"nologin"}}
+
+
                 JsonElement root = body.Convert2JsonElement();
 
                 bool success = root.Read<bool>("success", false);

molilian.core/obj/Debug/net8.0/molilian.core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+202f1661ece39a6a626434563e300fa86dc365a6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8e14776ffb15d944852bf020eea073160febd28")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.core/obj/Debug/net8.0/molilian.core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-7b0c4070f38bf181f0086c74e4a1942b3829e048b23b93be16ec45e00416f12e
+28371cce3a151e8809c17707fff20999eb56005c4552bc376589ecd053fa1272

molilian.core/obj/Debug/net8.0/molilian.core.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-f181f79e04917a77b40a7ec5ad18500bfcb454b1a38f0a05c3d1eddf2ddccb53
+738843e89aaa87f77c06557af242989eda435c4281ef198239d3ad0b38ba7218

molilian.core/obj/Release/net8.0/molilian.core.AssemblyInfo.cs

@@ -14,7 +14,7 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyCompanyAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+202f1661ece39a6a626434563e300fa86dc365a6")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d8e14776ffb15d944852bf020eea073160febd28")]
 [assembly: System.Reflection.AssemblyProductAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyTitleAttribute("molilian.core")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

molilian.core/obj/Release/net8.0/molilian.core.AssemblyInfoInputs.cache

@@ -1 +1 @@
-6cc59521876a65ec749faaa7297f0da389bd6a38f784b9fd5712225d5eeb5477
+87a60c3c0ce140c8cf5cb12c567f6ce37e26e057ac0013e3d7253310748a5b00

molilian.core/obj/Release/net8.0/molilian.core.csproj.CoreCompileInputs.cache

@@ -1 +1 @@
-69bb2212fd8cfffa9492f86c54854ea06f6740e87c86828b124c16a1e22c1c6b
+5ecf14f1cccf7ecdabcc412ef505782145094c4d6261ddae5e829215ed55936c

molilian.core/obj/molilian.core.csproj.nuget.dgspec.json

@@ -21,6 +21,7 @@
           "net8.0"
         ],
         "sources": {
+          "C:\\Program Files\\dotnet\\library-packs": {},
           "https://api.nuget.org/v3/index.json": {}
         },
         "frameworks": {
@@ -33,6 +34,11 @@
           "warnAsError": [
             "NU1605"
           ]
+        },
+        "restoreAuditProperties": {
+          "enableAudit": "true",
+          "auditLevel": "low",
+          "auditMode": "direct"
         }
       },
       "frameworks": {
@@ -76,7 +82,7 @@
               "privateAssets": "all"
             }
           },
-          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102/PortableRuntimeIdentifierGraph.json"
+          "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
         }
       }
     }

molilian.core/obj/molilian.core.csproj.nuget.g.props

@@ -7,7 +7,7 @@
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.8.1</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.10.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />

molilian.core/obj/project.assets.json

@@ -3537,6 +3537,7 @@
         "net8.0"
       ],
       "sources": {
+        "C:\\Program Files\\dotnet\\library-packs": {},
         "https://api.nuget.org/v3/index.json": {}
       },
       "frameworks": {
@@ -3549,6 +3550,11 @@
         "warnAsError": [
           "NU1605"
         ]
+      },
+      "restoreAuditProperties": {
+        "enableAudit": "true",
+        "auditLevel": "low",
+        "auditMode": "direct"
       }
     },
     "frameworks": {
@@ -3592,7 +3598,7 @@
             "privateAssets": "all"
           }
         },
-        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.102/PortableRuntimeIdentifierGraph.json"
+        "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.300/PortableRuntimeIdentifierGraph.json"
       }
     }
   }

molilian.core/obj/project.nuget.cache

@@ -1,6 +1,6 @@
 {
   "version": 2,
-  "dgSpecHash": "m0wPvnuQYQnxBzmOmpiLnYriNKPiKlGwNYgCsm135dWuo8SdqIkFX0epbh5tCkBIEHuA0b5lgLKPq+ZQhCEXIw==",
+  "dgSpecHash": "2SVD6qGoMWg=",
   "success": true,
   "projectFilePath": "E:\\project\\2024\\molilian\\server\\molilian.core\\molilian.core.csproj",
   "expectedPackageFiles": [