From 557c2711a3e103ebc3d0492344eca9730d5e92b2 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 17 二月 2025 10:47:47 +0800
Subject: [PATCH] 增加司机配送单超时处理任务，防止一直不停手机定位信息，
---
CoreCms.Net.Services/CYOAServices/CyinOAService.cs | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
index bff2835..9bae019 100644
--- a/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
+++ b/CoreCms.Net.Services/CYOAServices/CyinOAService.cs
@@ -59,8 +59,7 @@
const string IsSchoolID = "IsShoodsID:";
const string IsSchoolMangerID = "IsSchoolManger:";
const string IsDeliverManageKey = "IsDeliverManageKey:";
- private readonly ISqlSugarClient _CyDbClient;
- private readonly IUnitOfWork _UnitOfWork;
+ private readonly ISqlSugarClient _CyDbClient;
private readonly IHttpContextUser _User;
private readonly ICoreCmsUserServices _coreCmsUserServices;
private readonly IRedisOperationRepository _redisOperationRepository;
@@ -76,7 +75,7 @@
IRedisOperationRepository redisOperationRepository, ICoreCmsUserServices coreCmsUser)
{
- _UnitOfWork = unitOfWork;
+
_CyDbClient = unitOfWork.GetDbClient().GetConnection(AppSettingsConstVars.CYDbDbID);
_User = contextUser;
_coreCmsUserServices = coreCmsUserServices;
@@ -1073,11 +1072,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 +1213,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
{
--
Gitblit v1.9.1