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/Order/CoreCmsPlanOrderServices.cs | 191 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 168 insertions(+), 23 deletions(-)
diff --git a/CoreCms.Net.Services/Order/CoreCmsPlanOrderServices.cs b/CoreCms.Net.Services/Order/CoreCmsPlanOrderServices.cs
index a4525c3..08ba982 100644
--- a/CoreCms.Net.Services/Order/CoreCmsPlanOrderServices.cs
+++ b/CoreCms.Net.Services/Order/CoreCmsPlanOrderServices.cs
@@ -36,6 +36,7 @@
using static SKIT.FlurlHttpClient.Wechat.Api.Models.ScanProductAddV2Request.Types.Product.Types;
using NPOI.SS.Formula.Functions;
using CoreCms.Net.Model.FromBody;
+using Essensoft.Paylink.Alipay.Domain;
namespace CoreCms.Net.Services
@@ -101,9 +102,72 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- public async Task<AdminUiCallBack> DeleteByIdAsync(object id)
+ public async Task<AdminUiCallBack> DeleteByIdAsync(object id,string userName)
{
- return await _dal.DeleteByIdAsync(id);
+ var jm = new AdminUiCallBack() ;
+ try
+ {
+ //寮�濮嬩簨鍔″鐞�
+ _unitOfWork.BeginTran();
+ var order = await _dal.QueryByIdAsync(id);
+
+ if (order.status == 2) //&& string.IsNullOrEmpty(houtai)
+ {
+ _unitOfWork.RollbackTran();
+ jm.code = 1;
+ jm.msg = "璁㈠崟宸茬粡閿佸崟涓嶈兘閲嶅閿佸崟";
+ return jm;
+ }
+
+ order.upDataBy = userName;
+ order.upDataTime = DateTime.Now;
+
+
+
+
+
+
+
+ //order.keYongAmount = order.oldOrderAmount - order.orderAmount;
+
+
+
+ order.status = 2;
+
+ //if (order.keYongAmount > 0)
+ //{
+ // //淇敼鐢ㄦ埛浣欓
+
+ // var jmsss = await _coreCmsUserServices.UpdateBalance(order.userId, order.keYongAmount, "鐢ㄦ埛璁″垝璁㈠崟" + order.orderId + "娆鹃」缁撲綑");
+ //}
+
+
+
+ //}
+
+
+ //鏍￠獙鍚庡啀鍒涘缓璁㈠崟
+ var jmss = await _dal.UpdateAsync(order);
+
+
+
+
+
+
+ _unitOfWork.CommitTran();
+
+ jm.code = 0;
+ jm.data = order;
+ jm.msg = "閿佸崟鎴愬姛";
+ }
+ catch (Exception e)
+ {
+ _unitOfWork.RollbackTran();
+ jm.code = 1;
+ jm.msg = e.ToString();
+ }
+ return jm;
+ //return await _dal.DeleteByIdAsync(id);
}
/// <summary>
@@ -111,9 +175,77 @@
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
- public async Task<AdminUiCallBack> DeleteByIdsAsync(int[] ids)
+ public async Task<AdminUiCallBack> DeleteByIdsAsync(string[] ids, string userName)
{
- return await _dal.DeleteByIdsAsync(ids);
+ var jm = new AdminUiCallBack();
+ try
+ {
+ //寮�濮嬩簨鍔″鐞�
+ _unitOfWork.BeginTran();
+ var orders = await _dal.QueryListByClauseAsync(p => ids.Contains(p.orderId), p => p.orderId, OrderByType.Asc, true);
+
+ foreach (var order in orders)
+ {
+ if (order.status != 2) //&& string.IsNullOrEmpty(houtai)
+ {
+ order.upDataBy = userName;
+ order.upDataTime = DateTime.Now;
+ order.status = 2;
+ //鏍￠獙鍚庡啀鍒涘缓璁㈠崟
+ var jmss = await _dal.UpdateAsync(order);
+ }
+
+
+
+
+
+
+
+
+ //order.keYongAmount = order.oldOrderAmount - order.orderAmount;
+
+
+
+
+
+ //if (order.keYongAmount > 0)
+ //{
+ // //淇敼鐢ㄦ埛浣欓
+
+ // var jmsss = await _coreCmsUserServices.UpdateBalance(order.userId, order.keYongAmount, "鐢ㄦ埛璁″垝璁㈠崟" + order.orderId + "娆鹃」缁撲綑");
+ //}
+
+
+
+ //}
+
+
+
+ }
+
+
+
+
+
+
+
+
+
+
+ _unitOfWork.CommitTran();
+
+ jm.code = 0;
+ jm.data = orders;
+ jm.msg = "閿佸崟鎴愬姛";
+ }
+ catch (Exception e)
+ {
+ _unitOfWork.RollbackTran();
+ jm.code = 1;
+ jm.msg = e.ToString();
+ }
+ return jm;
+ //return await _dal.DeleteByIdsAsync(ids);
}
#endregion
@@ -143,10 +275,10 @@
/// <param name="blUseNoLock">鏄惁浣跨敤WITH(NOLOCK)</param>
/// <returns></returns>
public async Task<IPageList<CoreCmsPlanOrder>> QueryPageAsync(Expression<Func<CoreCmsPlanOrder, bool>> predicate,
- Expression<Func<CoreCmsPlanOrder, object>> orderByExpression, OrderByType orderByType, int pageIndex = 1,
+ Expression<Func<CoreCmsPlanOrder, object>> orderByExpression, OrderByType orderByType, OtherData otherData , int pageIndex = 1,
int pageSize = 20, bool blUseNoLock = false)
{
- return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, pageIndex, pageSize, blUseNoLock);
+ return await _dal.QueryPageAsync(predicate, orderByExpression, orderByType, otherData, pageIndex, pageSize, blUseNoLock);
}
#endregion
@@ -155,7 +287,7 @@
/// 鑾峰彇璁″垝璁㈠崟鍒楄〃寰俊灏忕▼搴�
/// </summary>
/// <returns></returns>
- public async Task<WebApiCallBack> GetOrderList(int status = -1, int userId = 0, int page = 1, int limit = 5)
+ public async Task<WebApiCallBack> GetOrderList(int status = -1, int userId = 0, int page = 1, int limit = 5, int money = 0)
{
var jm = new WebApiCallBack { status = true };
@@ -171,6 +303,10 @@
where = where.And(p => p.userId == userId);
}
+ if (money > 0)
+ {
+ where = where.And(p => p.keYongAmount > p.huaFeiAmount);
+ }
var list = await _dal.QueryPageAsync(where, p => p.createTime, OrderByType.Desc, page, limit);
if (list!=null && list.Count>0)
@@ -179,7 +315,7 @@
{
//鑾峰彇鐩稿叧鐘舵�佹弿杩拌鏄庤浆鎹�
order.statusText = EnumHelper.GetEnumDescriptionByValue<GlobalEnumVars.PlanOrderTiJiao>(order.status);
-
+ order.keYongAmount = order.keYongAmount - order.huaFeiAmount;
}
}
jm.data = new
@@ -219,11 +355,11 @@
var order = await _dal.QueryByIdAsync(orderId);
var oldorderAmount = order.orderAmount;
- if (order.status == 2 && string.IsNullOrEmpty(houtai))
+ if (order.status == 2 && string.IsNullOrEmpty(houtai))
{
_unitOfWork.RollbackTran();
jm.status = false;
- jm.otherData = "璁㈠崟宸茬粡鎻愪氦涓嶈兘淇敼";
+ jm.otherData = "璁㈠崟宸茬粡閿佸崟涓嶈兘淇敼";
return jm;
}
@@ -249,32 +385,36 @@
}
order.orderAmount = orderAmount;
- order.keYongAmount = order.oldOrderAmount - order.orderAmount;
+ order.keYongAmount = order.oldOrderAmount - order.orderAmount ;
- if (order.keYongAmount < 0)
+ if (order.keYongAmount < order.huaFeiAmount)
{
_unitOfWork.RollbackTran();
jm.status = false;
- jm.otherData = "璁㈠崟閲戦瓒呭嚭璁″垝閲戦";
+ jm.otherData = "鍙敤浣欓涓嶈冻";
return jm;
}
- var keYongAmount = oldorderAmount - orderAmount;
+ //var keYongAmount = oldorderAmount - orderAmount;
+ //if (order.status == 1)
+ //{
+ // keYongAmount = order.oldOrderAmount - order.orderAmount;
+ //}
- if (status == 2)
- {
- order.status = 2;
+ //if (status == 2)
+ //{
+ // order.status = 2;
- if (keYongAmount != 0)
- {
- //淇敼鐢ㄦ埛浣欓
+ // if (keYongAmount != 0)
+ // {
+ // //淇敼鐢ㄦ埛浣欓
- var jmsss = await _coreCmsUserServices.UpdateBalance(order.userId, keYongAmount, "鐢ㄦ埛璁″垝璁㈠崟"+ order.orderId + "娆鹃」缁撲綑");
- }
+ // var jmsss = await _coreCmsUserServices.UpdateBalance(order.userId, keYongAmount, "鐢ㄦ埛璁″垝璁㈠崟"+ order.orderId + "娆鹃」缁撲綑");
+ // }
- }
+ //}
//鏍￠獙鍚庡啀鍒涘缓璁㈠崟
@@ -337,6 +477,8 @@
if (user != null)
{
order.userId = user.id;
+ user.isplanorder = "鏄�";
+ var users = await _unitOfWork.GetDbClient().Updateable(user).ExecuteCommandAsync();
}
else
{
@@ -353,6 +495,8 @@
if (user != null)
{
order.userId = user.id;
+ user.isplanorder = "鏄�";
+ var users = await _unitOfWork.GetDbClient().Updateable(user).ExecuteCommandAsync();
}
else
{
@@ -428,6 +572,7 @@
order.orderAmount = orderAmount;
order.oldOrderAmount = orderAmount;
order.keYongAmount = 0;
+ order.huaFeiAmount = 0;
//鏍￠獙鍚庡啀鍒涘缓璁㈠崟
--
Gitblit v1.9.1