From 49de3197aa154674dbbd14c5196273dc82397d5f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 14 十月 2024 09:55:57 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
---
cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
index 8c9fd2a..ec45966 100644
--- a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -565,6 +565,7 @@
WorkPrice = a.WorkPrice,
TodaySalary = c.TodaySalary,
IsShenPi = c.IsShenPi,
+ ShenPitime = c.ShenPitime,
WorkCount = c.WorkCount,
WorkerUserId = b.WorkerUserId,
WorkerUserName = d.name,
@@ -723,6 +724,14 @@
//{
// throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
//}
+ if (orderBiddingDetail.IsShenPi.HasValue && orderBiddingDetail.IsShenPi == (int)IsShenPis.yishenpi && orderBiddingDetail.ShenPitime.HasValue && orderBiddingDetail.ShenPitime <= DateTime.Now.AddMinutes(-5))
+ {
+ throw Oops.Oh("瀹℃壒鏃堕棿宸茬粡瓒呰繃5鍒嗛挓锛屾棤娉曢噸鏂板鎵癸紒");
+ }
+
+
+
+
var res = false;
try
{
--
Gitblit v1.9.1