From 23518b1198cfb79c5a8f9d7d7921fb888c48a692 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期二, 11 二月 2025 11:52:31 +0800
Subject: [PATCH] no message
---
/dev/null | 11 -----------
.gitignore | 1 +
CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs | 4 ++--
CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props | 2 +-
CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs | 2 ++
CoreCms.Net.Services/CYOAServices/CyinOAService.cs | 10 +++++++---
6 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/.gitignore b/.gitignore
index 06522ef..4769dbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,4 @@
CoreCms.Net.Web.WebApi/CoreCms.Net.Web.WebApi.xml
CoreCms.Net.Uni-App/bin/
鏁版嵁搴�/
+CoreCms.Net.Web.WebApi/Properties/
diff --git a/CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs b/CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs
index f111a88..eee55e9 100644
--- a/CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs
+++ b/CoreCms.Net.Model/CyinOAModel/CoreCmsPlanOrder.cs
@@ -232,6 +232,8 @@
[SugarColumn(IsIgnore = true)]
public string DeliveryMoble { get; set; }
+
+
}
diff --git a/CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs b/CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs
index f4bd015..fac9cdf 100644
--- a/CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs
+++ b/CoreCms.Net.Model/CyinOAModel/CoreDeliverOrder.cs
@@ -7,7 +7,7 @@
namespace EC_SeckillInfo
{
///<summary>
- ///
+ ///閰嶉�佸崟
///</summary>
[SugarTable("CoreDeliverOrder")]
public partial class CoreDeliverOrder
@@ -110,7 +110,7 @@
public DateTime? MakeTime { get;set;}
/// <summary>
- /// 棰勭害鏃堕棿
+ /// 寮�濮嬫椂闂�
/// </summary>
public DateTime? StartTime { get; set; }
/// <summary>
diff --git a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
index bff2835..ee027df 100644
--- a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
+++ b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
@@ -1073,11 +1073,15 @@
deliverOrder = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
&& x.OrderState != CoreDeliverOrderType.Faile
&& x.OrderState != CoreDeliverOrderType.Completed
- && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First()
+ && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).First(),
+ MakeTime = SqlFunc.Subqueryable<CoreDeliverOrder>().Where(x => x.OrderId == n.id
+ && x.OrderState != CoreDeliverOrderType.Faile
+ && x.OrderState != CoreDeliverOrderType.Completed
+ && (x.DeliveryMoble != "" && x.DeliveryMoble != null)).OrderByDesc(x => x.CreateTime).Select(x=>x.MakeTime)
},
true
- ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
+ ).MergeTable().Where(where).OrderBy(n=>n.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);
var data = dlist.Select(x => new
{
@@ -1210,7 +1214,7 @@
}
, true
- ).MergeTable().Where(where).ToPageListAsync(entity.page, entity.limit, totalNumbe);
+ ).MergeTable().Where(where).OrderBy(x=>x.MakeTime).ToPageListAsync(entity.page, entity.limit, totalNumbe);
var deliveryList = await _CyDbClient.Queryable<OA_Staff>().Where(x => x.Status == "鍦ㄨ亴" && x.BF_IsDriver == true).Select(x => new
{
diff --git a/CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props b/CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props
index d62c82e..a78f913 100644
--- a/CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props
+++ b/CoreCms.Net.Uni-App/obj/CoreCms.Net.Uni-App.csproj.nuget.g.props
@@ -7,7 +7,7 @@
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
- <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.11.1</NuGetToolVersion>
+ <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.3</NuGetToolVersion>
</PropertyGroup>
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
diff --git a/CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
deleted file mode 100644
index c49e508..0000000
--- a/CoreCms.Net.Web.WebApi/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ /dev/null
@@ -1,11 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
- <PropertyGroup>
- <_PublishTargetUrl>D:\鐧惧垎鐧惧叺娉昞API</_PublishTargetUrl>
- <History>True|2024-11-27T00:59:58.9356363Z||;True|2024-11-22T13:15:11.8552617+08:00||;True|2024-11-21T09:59:12.6413208+08:00||;True|2024-11-20T09:00:43.9977878+08:00||;True|2024-11-19T12:57:11.1723885+08:00||;True|2024-11-14T15:48:37.2147562+08:00||;True|2024-11-14T15:36:23.1725803+08:00||;True|2024-11-14T15:25:54.9253406+08:00||;True|2024-11-14T13:32:56.5401650+08:00||;True|2024-11-13T17:33:36.1938552+08:00||;True|2024-11-13T15:31:29.3869845+08:00||;True|2024-11-13T15:27:11.3974109+08:00||;True|2024-11-13T15:14:39.2933051+08:00||;True|2024-11-13T14:24:52.8582465+08:00||;True|2024-11-13T09:53:23.5894948+08:00||;True|2024-11-12T14:47:59.7284833+08:00||;True|2024-11-12T09:19:24.2854122+08:00||;True|2024-11-08T08:59:03.7975322+08:00||;True|2024-11-07T10:49:34.2710419+08:00||;True|2024-11-07T09:10:55.4973420+08:00||;True|2024-11-06T13:12:02.1421513+08:00||;True|2024-11-06T12:25:13.6289735+08:00||;True|2024-11-06T09:05:25.0195410+08:00||;True|2024-11-05T15:57:49.9141760+08:00||;True|2024-11-05T13:20:20.2196550+08:00||;True|2024-11-04T11:14:20.0184333+08:00||;False|2024-11-04T11:13:31.2038940+08:00||;True|2024-11-01T11:09:18.4938189+08:00||;False|2024-11-01T11:08:48.5298972+08:00||;True|2024-11-01T09:16:11.5683384+08:00||;True|2024-03-22T16:31:04.2218156+08:00||;</History>
- <LastFailureDetails />
- </PropertyGroup>
-</Project>
\ No newline at end of file
--
Gitblit v1.9.1