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/Dtos/OrderDto.cs | 111 +++++++++++++++++++++
cylsg/cylsg.Application/Users/UserAppService.cs | 56 +++++++++++
cylsg/cylsg.Model/OrderModel/Order.cs | 19 +++
cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs | 2
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 42 +++++--
cylsg/cylsg.Application/Timers/TimedBackgroundService.cs | 59 +++++++++++
cylsg/cylsg.Web.Core/Startup.cs | 5
7 files changed, 272 insertions(+), 22 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index e98d7c7..93cef3f 100644
--- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
+++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
@@ -29,14 +29,106 @@
public string OrderName { get; set; }
/// <summary>
- /// 宸ヤ綔寮�濮嬫椂闂�
+ /// 宸ヤ綔寮�濮嬫棩鏈�
/// </summary>
public DateTime? WordStartTime { get; set; }
/// <summary>
- /// 宸ヤ綔缁撴潫鏃堕棿
+ /// 宸ヤ綔寮�濮嬫棩鏈熷悕绉�
+ /// </summary>
+ public string WordStartTimeName {
+ get
+ {
+ if (this.WordStartTime.HasValue)
+ {
+ // 鍙互娣诲姞鑷繁鐨勯�昏緫
+ return this.WordStartTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ return "";
+ }
+
+
+ }}
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃ユ湡
/// </summary>
public DateTime? WordEndTime { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃ユ湡鍚嶇О
+ /// </summary>
+ public string WordEndTimeName
+ {
+ get
+ {
+ if (this.WordEndTime.HasValue)
+ {
+ // 鍙互娣诲姞鑷繁鐨勯�昏緫
+ return this.WordEndTime.Value.ToString("yyyy-MM-dd");
+ }
+ else
+ {
+ return "";
+ }
+
+
+ }
+ }
+
+ /// <summary>
+ /// 宸ヤ綔寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime? StartTime { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔寮�濮嬫椂闂村悕绉�
+ /// </summary>
+ public string StartTimeName
+ {
+ get
+ {
+ if (this.StartTime.HasValue)
+ {
+ // 鍙互娣诲姞鑷繁鐨勯�昏緫
+ return this.StartTime.Value.ToString("HH:mm");
+ }
+ else
+ {
+ return "";
+ }
+
+
+ }
+ }
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime? EndTime { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃ユ湡鍚嶇О
+ /// </summary>
+ public string EndTimeName
+ {
+ get
+ {
+ if (this.EndTime.HasValue)
+ {
+ // 鍙互娣诲姞鑷繁鐨勯�昏緫
+ return this.EndTime.Value.ToString("HH:mm");
+ }
+ else
+ {
+ return "";
+ }
+
+
+ }
+ }
/// <summary>
/// 闇�姹�
@@ -214,9 +306,9 @@
{
/// <summary>
- /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// 鎷涘伐OrderId
/// </summary>
- public int OrderBiddingId { get; set; }
+ public int OrderId { get; set; }
/// <summary>
@@ -290,6 +382,17 @@
/// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public int WorkerUserId { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string WorkerName { get; set; }
+
+
+ /// <summary>
/// 鎵撳崱鏄庣粏
/// </summary>
public List<OrderBiddingDetailCheckDto> orderBiddingDetailCheck { get; set; }
diff --git a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
index 86db772..1a2bb2c 100644
--- a/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderCompanyAppService.cs
@@ -159,6 +159,8 @@
order.OrderName = orderDto.OrderName;
order.WordStartTime = orderDto.WordStartTime;
order.WordEndTime = orderDto.WordEndTime;
+ order.StartTime = orderDto.StartTime;
+ order.EndTime = orderDto.EndTime;
order.Demand = orderDto.Demand;
order.WorderCount = orderDto.WorderCount;
order.WorderAddress = orderDto.WorderAddress;
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;
diff --git a/cylsg/cylsg.Application/Timers/TimedBackgroundService.cs b/cylsg/cylsg.Application/Timers/TimedBackgroundService.cs
new file mode 100644
index 0000000..882b35e
--- /dev/null
+++ b/cylsg/cylsg.Application/Timers/TimedBackgroundService.cs
@@ -0,0 +1,59 @@
+锘縰sing cylsg.Core;
+using cylsg.Model.OrderModel;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace cylsg.Application.Timers
+{
+ public class TimedBackgroundService : IHostedService, IDisposable
+ {
+ private Timer _timer;
+ public Task StartAsync(CancellationToken cancellationToken)
+ {
+ _timer = new Timer(DoWork, null, TimeSpan.Zero, TimeSpan.FromSeconds(60*60));
+
+ return Task.CompletedTask;
+ }
+
+ private async void DoWork(object? state)
+ {
+ var orderBiddingRes = new BaseRepository<OrderBidding>();
+ var orderRes = new BaseRepository<Order>();
+ var orderBiddingDetailRes = new BaseRepository<OrderBiddingDetail>();
+ var orders = await orderRes.GetListAsync(x => x.OrderStatus < 2 && x.IsEn == true && x.IsDeleted == false && x.WordEndTime <= DateTime.Now.AddDays(-1));
+ foreach (var order in orders)
+ {
+ var sss = await orderBiddingRes.GetListAsync(x => x.OrderId == order.Id && x.IsEn == true && x.IsDeleted == false && x.IsSelected == true);
+ var bbb = sss.Select(x => x.Id).ToList();
+ var oCount = await orderBiddingDetailRes.CountAsync(x => bbb.Contains(x.OrderBiddingId) && x.IsEn == true && x.IsDeleted == false && x.IsShenPi != (int)IsShenPis.yishenpi);
+ if (oCount == 0)
+ {
+ order.OrderStatus = (int)OrderStatuses.jiesuanwanbi;
+ var res = await orderRes.UpdateAsync(order);
+
+ }
+ }
+ }
+
+ public Task StopAsync(CancellationToken cancellationToken)
+ {
+ Console.WriteLine("StopAsync");
+
+ return Task.CompletedTask;
+ }
+
+ public void Dispose()
+ {
+ _timer?.Dispose();
+ }
+
+
+
+ }
+}
diff --git a/cylsg/cylsg.Application/Users/UserAppService.cs b/cylsg/cylsg.Application/Users/UserAppService.cs
index bac83be..a3f0c08 100644
--- a/cylsg/cylsg.Application/Users/UserAppService.cs
+++ b/cylsg/cylsg.Application/Users/UserAppService.cs
@@ -285,6 +285,60 @@
}
-
+
+
+ /// <summary>
+ /// 淇濆瓨鐢ㄦ埛淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public async Task<bool> saveUser(UserDto userDto)
+ {
+
+ var UserID = App.User?.FindFirstValue("UserID");
+ int userid = 0;
+ string NickName = App.User?.FindFirstValue("NickName");
+ if (!string.IsNullOrEmpty(UserID))
+ {
+ userid = int.Parse(UserID);
+ }
+ if (!string.IsNullOrEmpty(userDto.Nickname) && userDto.Nickname.Length > 100)
+ {
+ throw Oops.Oh("鏄电О闀垮害杩囬暱锛�");
+ }
+ if (!string.IsNullOrEmpty(userDto.Avatar) && userDto.Avatar.Length > 500)
+ {
+ throw Oops.Oh("澶村儚闀垮害杩囬暱锛�");
+ }
+
+
+ var userRes = new BaseRepository<User>();
+ bool res;
+
+ var user = await userRes.GetByIdAsync(userid);
+
+ if (!string.IsNullOrEmpty(userDto.Nickname))
+ user.Nickname = userDto.Nickname;
+ if (!string.IsNullOrEmpty(userDto.Avatar))
+ user.Avatar = userDto.Avatar;
+
+
+ user.UpDataBy = NickName;
+ user.UpDataTime = DateTime.Now;
+ res = await userRes.UpdateAsync(user);
+
+
+
+
+
+
+
+
+
+
+ return res;
+ }
+
+
+
}
}
diff --git a/cylsg/cylsg.Model/OrderModel/Order.cs b/cylsg/cylsg.Model/OrderModel/Order.cs
index bad6fe3..d901ab2 100644
--- a/cylsg/cylsg.Model/OrderModel/Order.cs
+++ b/cylsg/cylsg.Model/OrderModel/Order.cs
@@ -37,18 +37,33 @@
public string OrderName { get; set; }
/// <summary>
+ /// 宸ヤ綔寮�濮嬫棩鏈�
+ /// </summary>
+ [Display(Name = "宸ヤ綔寮�濮嬫棩鏈�")]
+ [SugarColumn(ColumnDescription = "宸ヤ綔寮�濮嬫棩鏈�", IsNullable = true)]
+ public DateTime? WordStartTime { get; set; }
+
+ /// <summary>
+ /// 宸ヤ綔缁撴潫鏃堕棿
+ /// </summary>
+ [Display(Name = "宸ヤ綔缁撴潫鏃ユ湡")]
+ [SugarColumn(ColumnDescription = "宸ヤ綔缁撴潫鏃ユ湡", IsNullable = true)]
+ public DateTime? WordEndTime { get; set; }
+
+
+ /// <summary>
/// 宸ヤ綔寮�濮嬫椂闂�
/// </summary>
[Display(Name = "宸ヤ綔寮�濮嬫椂闂�")]
[SugarColumn(ColumnDescription = "宸ヤ綔寮�濮嬫椂闂�", IsNullable = true)]
- public DateTime? WordStartTime { get; set; }
+ public DateTime? StartTime { get; set; }
/// <summary>
/// 宸ヤ綔缁撴潫鏃堕棿
/// </summary>
[Display(Name = "宸ヤ綔缁撴潫鏃堕棿")]
[SugarColumn(ColumnDescription = "宸ヤ綔缁撴潫鏃堕棿", IsNullable = true)]
- public DateTime? WordEndTime { get; set; }
+ public DateTime? EndTime { get; set; }
/// <summary>
/// 闇�姹�
diff --git a/cylsg/cylsg.Web.Core/Startup.cs b/cylsg/cylsg.Web.Core/Startup.cs
index 9bda758..17e5e41 100644
--- a/cylsg/cylsg.Web.Core/Startup.cs
+++ b/cylsg/cylsg.Web.Core/Startup.cs
@@ -1,7 +1,9 @@
-锘縰sing cylsg.Core;
+锘縰sing cylsg.Application.Timers;
+using cylsg.Core;
using cylsg.Web.Core.Handlers;
using Furion;
using Furion.VirtualFileServer;
+using InitQ;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
@@ -28,6 +30,7 @@
return DbContext.Instance;
}
);
+ services.AddHostedService<TimedBackgroundService>();
services.AddJsonOptions(options =>
{
//鏇存敼杈撳嚭杈撳叆鏋氫妇灞炴�т负 瀛楁鍚�
--
Gitblit v1.9.1