From b53678eec74cadc4d8d5773343b10ffa2adc5330 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 03 九月 2024 09:50:27 +0800
Subject: [PATCH] 最新代码
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 61b287c..76f27a1 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -359,6 +359,7 @@
var orderRes = new BaseRepository<Order>();
var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
+ var userWorkerRes = new BaseRepository<UserWorker>();
var order = await orderRes.GetByIdAsync(baoMingDto.OrderId);
if (order == null || order.OrderStatus > 1)
{
@@ -378,6 +379,11 @@
throw Oops.Oh("褰撳ぉ鐨勬墦鍗″凡缁忔彁浜わ紝涓嶈兘鎵撳崱锛�");
}
orderBiddingDetailDto = _mapper.Map<OrderBiddingDetailDto>(orderBiddingDetail);
+ orderBiddingDetailDto.WorkerUserId = orderBidding.WorkerUserId;
+ var worker = await userWorkerRes.GetFirstAsync(x => x.UserId == orderBidding.WorkerUserId);
+ if(worker != null)
+ orderBiddingDetailDto.WorkerName = worker.name;
+
var orderBiddingDetailChecks = await OrderBiddingDetailCheckRes.GetListAsync(x => x.OrderBiddingDetailId == orderBiddingDetail.Id && x.IsDeleted == false && x.IsEn == true);
orderBiddingDetailDto.orderBiddingDetailCheck = _mapper.Map<List<OrderBiddingDetailCheckDto>>(orderBiddingDetailChecks);
}
@@ -407,19 +413,25 @@
var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
- var orderBidding = await orderBiddingRes.GetByIdAsync(dakaDto.OrderBiddingId);
+ var order = await orderRes.GetByIdAsync(dakaDto.OrderId);
+ if (order == null || order.OrderStatus > 1)
+ {
+ throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱锛�");
+ }
+
+ var orderBidding = await orderBiddingRes.GetFirstAsync(x => x.OrderId == dakaDto.OrderId && x.WorkerUserId == userid && x.IsSelected == true && x.IsEn == true && x.IsDeleted == false );//GetByIdAsync(dakaDto.OrderBiddingId);
if (orderBidding == null || orderBidding.IsDeleted ==true || orderBidding.IsEn == false || orderBidding.IsSelected !=true )
{
throw Oops.Oh("璇ユ姇閫掔姸鎬佹棤娉曟墦鍗★紒");
}
- var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
- if (order == null || order.OrderStatus > 1)
- {
- throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱锛�");
- }
+
bool res;
var dateTime = DateTime.Now.Date;
+ if ( dateTime < order.WordStartTime.Value && dateTime > order.WordEndTime.Value )
+ {
+ throw Oops.Oh("涓嶅湪鍏佽鎵撳崱鐨勬椂闂磋寖鍥达紒");
+ }
var orderBiddingDetail = await orderBiddingDetailRes.GetFirstAsync(x => x.OrderBiddingId == orderBidding.Id && x.WorkDate == dateTime && x.IsDeleted == false && x.IsEn == true);
if (orderBiddingDetail!=null && orderBiddingDetail.IsShenPi>0)
{
@@ -438,7 +450,7 @@
{
throw Oops.Oh("鍛樺伐鏈敞鍐屾垚宸ヤ汉");
}
- var faseres = _tencentCloudService.VerifyFace(dakaDto.FaceImg, UserWorkRes.IAIPersonId);
+ var faseres = _tencentCloudService.VerifyFace(dakaDto.FaceImg, UserWorkRes.IdCode);
if (faseres.IsMatch != true)
{
@@ -740,21 +752,23 @@
//var OrderBiddingDetailCheckRes = new BaseRepository<OrderBiddingDetailCheck>();
var orderBiddingDetail = await orderBiddingDetailRes.GetByIdAsync(dakaDto.OrderBiddingDetailId);
+ if (orderBiddingDetail == null || orderBiddingDetail.IsShenPi > 1 || orderBiddingDetail.IsDeleted == true || orderBiddingDetail.IsEn == false)
+ {
+ throw Oops.Oh("璇ユ墦鍗＄姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
+ }
var orderBidding = await orderBiddingRes.GetByIdAsync(orderBiddingDetail.OrderBiddingId);
- var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
-
if (orderBidding == null || orderBidding.IsDeleted == true || orderBidding.IsEn == false || orderBidding.IsSelected != true)
{
throw Oops.Oh("璇ユ姇閫掔姸鎬佹棤娉曟墦鍗＄‘璁わ紒");
}
- if (order == null || order.OrderStatus > 1)
+ var order = await orderRes.GetByIdAsync(orderBidding.OrderId);
+
+
+ if (order == null || order.OrderStatus > 1 || order.IsDeleted == true || order.IsEn == false )
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
}
- if (orderBiddingDetail == null || orderBiddingDetail.IsShenPi > 1)
- {
- throw Oops.Oh("璇ユ墦鍗＄姸鎬佸凡鏃犳硶鎵撳崱纭锛�");
- }
+
orderBiddingDetail.WorkTime = dakaDto.WorkTime;
--
Gitblit v1.9.1