From 5a72c00dca19dd6dd9be9db9e14f00f512f93f02 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 29 十月 2024 13:10:22 +0800
Subject: [PATCH] 小修改
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 26 +++++++++++++++++++++-----
1 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 1c68a36..ecb7c12 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -193,7 +193,7 @@
{
switch (orderDto.OrderStatus)
{
- case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷"; break;
+ case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷涓�"; break;
case (int)OrderStatuses.zhaogongwanbi: orderDto.OrderStatusName = "鎷涘伐瀹屾瘯"; break;
case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "缁撶畻瀹屾瘯"; break;
default: break;
@@ -263,10 +263,14 @@
var orderBiddingWorkPriceRepository = new BaseRepository<OrderBiddingWorkPrice>();
var userRes = new BaseRepository<User>();
var order = await orderRes.GetByIdAsync(orderid);
+ if (order.IsDeleted == true)
+ {
+ throw Oops.Oh("璁㈠崟宸茬粡鍒犻櫎鏃犳硶鏌ョ湅锛�");
+ }
orderDto = _mapper.Map<OrderDto>(order);
switch (orderDto.OrderStatus)
{
- case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷"; break;
+ case (int)OrderStatuses.fabu: orderDto.OrderStatusName = "鍙戝竷涓�"; break;
case (int)OrderStatuses.zhaogongwanbi: orderDto.OrderStatusName = "鎷涘伐瀹屾瘯"; break;
case (int)OrderStatuses.jiesuanwanbi: orderDto.OrderStatusName = "缁撶畻瀹屾瘯"; break;
default: break;
@@ -542,6 +546,17 @@
{
throw Oops.Oh("璇ユ墦鍗¤褰曞凡缁忓鎵癸紝涓嶈兘鎵撳崱锛�");
}
+ if (orderBiddingDetail != null)
+ {
+ var orderBiddingDetailCheck1 = (await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsDeleted == false && x.IsEn == true )).OrderByDescending(x=>x.Checktime).FirstOrDefault();
+ if (orderBiddingDetailCheck1 != null && orderBiddingDetailCheck1.Checktime >= DateTime.Now.AddMinutes(-10))
+ {
+ throw Oops.Oh("涓ゆ鎵撳崱鏃堕棿涔嬮棿蹇呴』闂撮殧瓒呰繃10鍒嗛挓锛�");
+ }
+ }
+
+
+
//浜鸿劯璇嗗埆
if (App.Configuration["VerifyFace:Enable"].ObjToBool())
{
@@ -629,8 +644,8 @@
JoinType.Inner, b.Id == c.OrderBiddingId ,
JoinType.Inner, a.OrderUserId == d.UserId
))
- .Where((a, b, c, d) => a.IsEn == true && a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
- && b.IsSelected == true && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false )
+ .Where((a, b, c, d) => a.IsDeleted == false && b.IsEn == true && b.IsDeleted == false && c.IsEn == true && c.IsDeleted == false
+ && b.IsSelected == true && b.WorkerUserId == userid && d.IsEn == true && d.IsDeleted == false) //a.IsEn == true &&
.WhereIF(page.WordDate.HasValue, (a, b, c, d) => (c.WorkDate == page.WordDate))
.WhereIF(page.WordDateStart.HasValue, (a, b, c, d) => (c.WorkDate >= page.WordDateStart))
.WhereIF(page.WordDateEnd.HasValue, (a, b, c, d) => (c.WorkDate <= page.WordDateEnd))
@@ -801,6 +816,7 @@
orderDakaMingxiDto.WorkPrice = order.WorkPrice;
orderDakaMingxiDto.TodaySalary = orderBiddingDetail.TodaySalary;
orderDakaMingxiDto.IsShenPi = orderBiddingDetail.IsShenPi;
+ orderDakaMingxiDto.ShenPitime = orderBiddingDetail.ShenPitime;
orderDakaMingxiDto.WorkCount = orderBiddingDetail.WorkCount;
orderDakaMingxiDto.WorkerUserId = orderBidding.WorkerUserId;
var user = await userRes.GetByIdAsync(orderDakaMingxiDto.WorkerUserId);
@@ -907,7 +923,7 @@
var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
- if (order == null || order.OrderStatus > 1 || order.IsDeleted == true || order.IsEn == false )
+ if (order == null || order.OrderStatus > 1 || order.IsDeleted == true)// || order.IsEn == false
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
}
--
Gitblit v1.9.1