From f2f61fdb9a81fba256b1bd05330fbbac2633149a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 27 八月 2024 16:38:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
---
cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs | 133 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 119 insertions(+), 14 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
index 3f658a3..61b287c 100644
--- a/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
+++ b/cylsg/cylsg.Application/Orders/OrderWorkerAppService.cs
@@ -3,9 +3,11 @@
using cylsg.Core;
using cylsg.Model.OrderModel;
using cylsg.Model.UserModel;
+using EzTencentCloud;
using Furion.LinqBuilder;
using MapsterMapper;
using Org.BouncyCastle.Asn1.X509;
+using SqlSugar.Extensions;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -26,11 +28,13 @@
private readonly ISystemService _systemService;
private ISqlSugarClient _sqlSugarClient;
private IMapper _mapper;
- public OrderWorkerAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper)
+ private readonly ITencentCloudService _tencentCloudService;
+ public OrderWorkerAppService(ISystemService systemService, ISqlSugarClient sqlSugarClient, IMapper mapper,ITencentCloudService tencentCloudService)
{
_systemService = systemService;
_sqlSugarClient = sqlSugarClient;
_mapper = mapper;
+ _tencentCloudService = tencentCloudService;
}
@@ -182,6 +186,7 @@
+
/// <summary>
/// 鏍规嵁Id鏌ヨ鎷涘伐鏄庣粏
/// </summary>
@@ -273,7 +278,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -292,6 +297,10 @@
if (order == null || order.OrderStatus>0)
{
throw Oops.Oh("璇ユ嫑宸ョ姸鎬佸凡缁忔棤娉曟姇閫掞紒");
+ }
+ if (order.OrderUserId == userid)
+ {
+ throw Oops.Oh("鑷繁鏃犳硶鎶曢�掕嚜宸卞彂甯冪殑鎷涘伐锛�");
}
bool res;
@@ -316,9 +325,9 @@
orderBidding1.WorkerUserId = userid;
orderBidding1.OrderId = baoMingDto.OrderId;
orderBidding1.IsSelected = false;
- orderBidding1.UpDataBy = ITCode;
+ orderBidding1.UpDataBy = NickName;
orderBidding1.UpDataTime = DateTime.Now;
- orderBidding1.CreateBy = ITCode;
+ orderBidding1.CreateBy = NickName;
orderBidding1.CreateTime = DateTime.Now;
res = await orderBiddingRes.InsertAsync(orderBidding1);
@@ -338,7 +347,7 @@
{
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -387,7 +396,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -416,6 +425,30 @@
{
throw Oops.Oh("璇ユ墦鍗¤褰曞凡缁忓鎵癸紝涓嶈兘鎵撳崱锛�");
}
+ //浜鸿劯璇嗗埆
+ if (App.Configuration["VerifyFace:Enable"].ObjToBool())
+ {
+ if (string.IsNullOrWhiteSpace(dakaDto.FaceImg))
+ {
+ throw Oops.Oh("鏈瘑鍒汉鑴�");
+ }
+
+ var UserWorkRes = await new BaseRepository<UserWorker>().GetFirstAsync(x => x.UserId == userid);
+ if (UserWorkRes == null)
+ {
+ throw Oops.Oh("鍛樺伐鏈敞鍐屾垚宸ヤ汉");
+ }
+ var faseres = _tencentCloudService.VerifyFace(dakaDto.FaceImg, UserWorkRes.IAIPersonId);
+
+ if (faseres.IsMatch != true)
+ {
+ throw Oops.Oh("涓嶆槸鏈汉");
+ }
+ }
+
+
+
+
if(orderBiddingDetail == null)
{
orderBiddingDetail = new OrderBiddingDetail();
@@ -423,9 +456,9 @@
orderBiddingDetail.WorkDate = dateTime;
orderBiddingDetail.IsShenPi = 0;
orderBiddingDetail.IsTiXian = false;
- orderBiddingDetail.UpDataBy = ITCode;
+ orderBiddingDetail.UpDataBy = NickName;
orderBiddingDetail.UpDataTime = DateTime.Now;
- orderBiddingDetail.CreateBy = ITCode;
+ orderBiddingDetail.CreateBy = NickName;
orderBiddingDetail.CreateTime = DateTime.Now;
orderBiddingDetail.Id = await orderBiddingDetailRes.InsertReturnIdentityAsync(orderBiddingDetail);
}
@@ -434,9 +467,9 @@
orderBiddingDetailCheck.OrderBiddingDetailId = orderBiddingDetail.Id;
orderBiddingDetailCheck.CheckPhoto = dakaDto.CheckPhoto;
orderBiddingDetailCheck.Checktime = DateTime.Now;
- orderBiddingDetailCheck.UpDataBy = ITCode;
+ orderBiddingDetailCheck.UpDataBy = NickName;
orderBiddingDetailCheck.UpDataTime = DateTime.Now;
- orderBiddingDetailCheck.CreateBy = ITCode;
+ orderBiddingDetailCheck.CreateBy = NickName;
orderBiddingDetailCheck.CreateTime = DateTime.Now;
res = await OrderBiddingDetailCheckRes.InsertAsync(orderBiddingDetailCheck);
@@ -591,7 +624,7 @@
{
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -695,7 +728,7 @@
var UserID = App.User?.FindFirstValue("UserID");
int userid = 0;
- string ITCode = App.User?.FindFirstValue("ITCode");
+ string NickName = App.User?.FindFirstValue("NickName");
if (!string.IsNullOrEmpty(UserID))
{
userid = int.Parse(UserID);
@@ -728,9 +761,9 @@
orderBiddingDetail.WorkCount = dakaDto.WorkCount;
orderBiddingDetail.TodaySalary = dakaDto.TodaySalary;
orderBiddingDetail.IsShenPi = 1;
- orderBiddingDetail.UpDataBy = ITCode;
+ orderBiddingDetail.UpDataBy = NickName;
orderBiddingDetail.UpDataTime = DateTime.Now;
- //orderBiddingDetail.CreateBy = ITCode;
+ //orderBiddingDetail.CreateBy = NickName;
//orderBiddingDetail.CreateTime = DateTime.Now;
var res = await orderBiddingDetailRes.UpdateAsync(orderBiddingDetail);
@@ -742,5 +775,77 @@
+
+ /// <summary>
+ /// 鏌ヨ宸ヤ汉鐨勬敹鍏ヨ褰�
+ /// </summary>
+ /// <param name="page"></param>
+ /// <returns></returns>
+ [Authorize]
+ [HttpPost]
+ public async Task<PageResult<UserTiXianDetailDto>> PostMyTiXianDetailListPage(PageBaseSearch page)
+ {
+ var UserID = App.User?.FindFirstValue("UserID");
+ int userid = 0;
+ if (!string.IsNullOrEmpty(UserID))
+ {
+ userid = int.Parse(UserID);
+ }
+
+ PageResult<UserTiXianDetailDto> result = new PageResult<UserTiXianDetailDto>();
+
+ RefAsync<int> total = 0;
+
+
+ var userTiXianDetailRepository = new BaseRepository<UserTiXianDetail>();
+
+ var data = await userTiXianDetailRepository.Context.Queryable<UserTiXianDetail>()
+ .Where(a => a.IsEn == true && a.IsDeleted == false && a.UserId == userid)
+ .OrderByDescending(a => a.CreateTime)
+ .Select(a => new UserTiXianDetailDto
+ {
+ Id = a.Id,
+ UserId = a.UserId,
+ YiTiXianJine = a.YiTiXianJine,
+ ZhiChuShouRu = a.ZhiChuShouRu,
+ Remark = a.Remark,
+
+
+ })
+
+ .ToPageListAsync(page.PageIndex, page.PageSize, total);
+
+ if (data != null && data.Count > 0)
+ {
+ foreach (var userTiXianDetailDto in data)
+ {
+
+ switch (userTiXianDetailDto.ZhiChuShouRu)
+ {
+ case (int)ZhiChuShouRus.zhichu: userTiXianDetailDto.ZhiChuShouRuName = "鏀嚭"; break;
+ case (int)ZhiChuShouRus.shouru: userTiXianDetailDto.ZhiChuShouRuName = "鏀跺叆"; break;
+ default: break;
+ }
+
+
+
+
+
+
+
+
+ }
+
+ }
+ result.Items = data;
+ result.PageIndex = page.PageIndex;
+ result.PageSize = page.PageSize;
+ result.TotalCount = total;
+
+ return result;
+ }
+
+
+
}
}
--
Gitblit v1.9.1