新增：联盟推广订单

molilian.api/Controllers/admin/TaobaoOrderController.cs

@@ -0,0 +1,77 @@
+using molilian.core;
+using dodohold.core;
+using Microsoft.AspNetCore.Mvc;
+using System.Text.Json;
+namespace molilian.api.Controllers
+{
+    [ApiController]
+    [MyAuthorize("admin")]
+    [Route("api/[controller]/[action]")]
+    public class TaobaoOrderController : ControllerBase
+    {
+        readonly IAuthorizationProvider provider = new AdminProvider();
+        protected IHttpContextAccessor _accessor;
+        public TaobaoOrderController(IHttpContextAccessor accessor)
+        {
+            _accessor = accessor;
+        }
+         
+          
+        [HttpPost]
+        public ActionResult list([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 time = 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 (time.Count == 2)
+            {
+                if (DateTime.TryParse(time[0], out stime) && DateTime.TryParse(time[1], out etime))
+                {
+                    etime = etime.AddDays(1).AddSeconds(-1);
+                    filter += $" AND tkPaidTime BETWEEN @stime AND @etime";
+                }
+            }
+            filter = filter.StringTrimStart(" AND ");
+
+            //排序
+            string orderBy = "tkPaidTime DESC";
+            if (!string.IsNullOrEmpty(order))
+            {
+                order = "descending".Equals(order) ? "DESC" : "ASC";
+                orderBy = sort switch
+                {
+                    _ => $"{sort} {order}",
+                };
+            }
+
+            var result = new DBContext.Table("tk_order_details")
+                .Where(filter, new { name, stime, etime })
+                .Page(size, page)
+                .Order(orderBy)
+                .PageList<TkOrderDetailDTO>(getTotal);
+
+
+            //foreach (var item in result.List)
+            //{
+            //    if (string.IsNullOrEmpty(name))
+            //    {
+            //        item.accountName = "-";
+            //    }
+            //}
+            return new APIResult(new { data = result });
+        }
+
+    }
+}

molilian.api/Controllers/public/TkController.cs

@@ -498,8 +498,10 @@ namespace molilian.api.Controllers
 
 
         [HttpGet]
-        public async Task<ActionResult> dplist([FromQuery] string a = "", [FromQuery] int t = 0, [FromQuery] string sign = "")
+        public async Task<ActionResult> dplist([FromQuery] string query = "", [FromQuery] string a = "", [FromQuery] int t = 0, [FromQuery] string sign = "")
         {
+            query = "";
+
             //验证签名
             if (string.IsNullOrEmpty(a) || string.IsNullOrEmpty(sign))
             {
@@ -526,7 +528,7 @@ namespace molilian.api.Controllers
             List<object> list = [];
 
             Random rand = new Random();
-            if (rand.Next(0, 10) < 2)
+            if (rand.Next(0, 10) > 1)
             {
                 list =
                 [
@@ -534,16 +536,19 @@ namespace molilian.api.Controllers
                 {
                     url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&h5Url=https%3A%2F%2Fs.click.taobao.com%2FgRtQClt&backURL=__back_url__",
                     count = 1,
+                    time = DateTime.Now,
                 },
                 new
                 {
                     url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&h5Url=https%3A%2F%2Fs.click.taobao.com%2FDZLLYkt&backURL=__back_url__",
                     count = 1,
+                    time = DateTime.Now,
                 },
                 new
                 {
                     url = "tbopen://m.taobao.com/tbopen/index.html?action=ali.open.nav&module=h5&h5Url=https%3A%2F%2Fs.click.taobao.com%2FtLVLYkt&backURL=__back_url__",
                     count = 1,
+                    time = DateTime.Now,
                 },
             ];
 
@@ -552,7 +557,7 @@ namespace molilian.api.Controllers
             return new APIResult(new
             {
                 success = true,
-                message = "ok",
+                message = list.Count == 0 ? "none" : "ok",
                 data = list,
             });
 

molilian.api/obj/Container/ImageId.cache

@@ -1 +1 @@
-sha256:13a52217501feb9c6315b55f6eaa02611741fd01e1322065cc5e06f0dce02eaf
+sha256:52bc4795b5a0219b805d800177b965f2650998912a3ecf18ea5645f29bf5e4b5

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+61e21098bbfb0e818639c54db9addfc30c47aa73")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
 [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 @@
-dcdab29418b6fd66b5419626052282487c7dc908d036a718537a6d78b5f493bd
+7a4a4131a5385d1e76b7b01ecec39a88196041c0b627bb7024eb29814537eca4

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

@@ -1 +1 @@
-7137abc7afe76216925cf78bdd00b709f8927aeeeb427b27f90bef5b86220811
+fabecc6d286b85f6d0f303f3d5bf732d49e76e9060b9985e8df20ac92cfe81b5

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+d8e14776ffb15d944852bf020eea073160febd28")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
 [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 @@
-2babe4355fdace8885357923b7ded2f3c391cb2100470ec32705f60e64737c34
+47fa840a8fbedee40fc6c0ecf2524ae20cffb74f3c3211b9370db891169b7fd5

molilian.core/Plus/Alimama/parse_2.cs

@@ -78,7 +78,8 @@ namespace molilian.core
                 url.Contains("//outfliggys.m.taobao.com/app/trip/rx-travel-detail") ||
                 url.Contains("//detail.m.tmall.com/item.htm?") ||
                 url.Contains("//tmallx.tmall.com/app/tmallx-src/goods-detail") ||
-                url.Contains("//detail.tmall.com/item.htm?"))
+                url.Contains("//detail.tmall.com/item.htm?") ||
+                url.Contains("//detail.tmall.hk/hk/item.htm?"))
             {
                 string? itemId = ExtractItemId(url);
                 if (!string.IsNullOrEmpty(itemId))

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+d8e14776ffb15d944852bf020eea073160febd28")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61e986665b50d2d310824b834b5baa7f4b021e27")]
 [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 @@
-28371cce3a151e8809c17707fff20999eb56005c4552bc376589ecd053fa1272
+42f4545ebae39a17d249f1813c701543f481bd7e6c7a18c23e35980fee65f0cf