From 24f914a80d01fa8e5c6cfcba14ae59a6c0a117a8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 25 八月 2025 09:39:22 +0800
Subject: [PATCH] 修改
---
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 293 +++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 228 insertions(+), 65 deletions(-)
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
index 84eb371..b4f5c50 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
@@ -31,6 +31,7 @@
using MimeKit;
using static SKIT.FlurlHttpClient.Wechat.Api.Events.TransferCustomerServiceReply.Types;
using Aop.Api.Domain;
+using FZCZTB.NET.MD.CutomerMd.Extend;
namespace FZCZTB.TSCL.Application;
/// <summary>
@@ -76,9 +77,13 @@
{
usertrueId = userId;
}
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- var collection = await _CollectionRep.AsQueryable().Where(x =>x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
+ var collection = await _CollectionRep.AsQueryable().Where(x =>x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
if (input.isColection && collection != null)
{
return true;
@@ -104,6 +109,7 @@
entity.CreateUserName = RealName;
entity.UpdateUserId = usertrueId;
entity.UpdateUserName = RealName;
+ entity.CusExtendId = customerExId;
entity.TenderId = input.TenderOrderId;
}
return await _CollectionRep.InsertAsync(entity);
@@ -124,8 +130,11 @@
long userId = 0;
long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId);
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var query = _sqlSugarClient.Queryable<Collection,TenderOrder>((a, b) => a.TenderId == b.Id)
- .Where((a, b) => a.CreateUserId == userId)
+ .Where((a, b) => a.CusExtendId == customerExId)
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectName), (a, b) => b.ProjectName.Contains(input.ProjectName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Dailijigoumingcheng), (a, b) => b.Dailijigoumingcheng.Contains(input.Dailijigoumingcheng.Trim()))
@@ -193,14 +202,103 @@
+ ///// <summary>
+ ///// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂 鉃�
+ ///// </summary>
+ ///// <param name="input"></param>
+ ///// <returns></returns>
+ //[DisplayName("渚涘簲鍟嗘敮浠樻姤鍚嶈垂")]
+ //[ApiDescriptionSettings(Name = "AddBaomingfei"), HttpPost]
+ //public async Task<bool> AddBaomingfei(SuplierBaomingfeiInput input)
+ //{
+
+
+ // long userId = 0;
+ // long? usertrueId = null;
+ // if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
+ // {
+ // usertrueId = userId;
+ // }
+ // var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+
+ // string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ // if (CustomerLogoinType != "GYS" )
+ // {
+ // throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳芥敮浠樻姤鍚嶈垂锛�");
+ // }
+
+ // var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
+ // if (tenderOrder == null)
+ // {
+ // throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ // }
+
+
+
+ // //if (tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
+ // //{
+ // var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
+ // if(tenderOrderBidding!=null && (tenderOrderBidding.IsTransfer.HasValue && tenderOrderBidding.IsTransfer.Value))
+ // {
+ // throw Oops.Oh("宸茬粡浠樻锛�");
+ // }
+
+
+
+ // if (tenderOrderBidding == null)
+ // {
+ // tenderOrderBidding = new TenderOrderBidding();
+ // tenderOrderBidding.Id = Guid.NewGuid();
+ // tenderOrderBidding.TenderId = input.TenderOrderId;
+ // tenderOrderBidding.IsTransfer = true;
+ // tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
+ // tenderOrderBidding.TransferTime = DateTime.Now;
+ // tenderOrderBidding.TransferNo = "BMF"+tenderOrderBidding.Id.ToString("N");
+ // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+
+ // tenderOrderBidding.CreateTime = DateTime.Now;
+ // tenderOrderBidding.CreateUserId = usertrueId;
+ // tenderOrderBidding.CreateUserName = RealName;
+ // tenderOrderBidding.UpdateTime = DateTime.Now;
+ // tenderOrderBidding.UpdateUserId = usertrueId;
+ // tenderOrderBidding.UpdateUserName = RealName;
+ // return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
+ // }
+ // else
+ // {
+ // tenderOrderBidding.IsTransfer = true;
+ // tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
+ // tenderOrderBidding.TransferTime = DateTime.Now;
+ // tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ // tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ // tenderOrderBidding.UpdateTime = DateTime.Now;
+ // tenderOrderBidding.UpdateUserId = usertrueId;
+ // tenderOrderBidding.UpdateUserName = RealName;
+ // return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
+ // }
+
+
+
+ // //}
+ // //else
+ // //{
+ // // throw Oops.Oh("鏃犻渶鏀粯鎶ュ悕璐癸紒");
+ // //}
+
+ //}
+
+
+
+
/// <summary>
- /// 渚涘簲鍟嗘敮浠樻姤鍚嶈垂 鉃�
+ /// 渚涘簲鍟嗚幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭� 鉃�
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
- [DisplayName("渚涘簲鍟嗘敮浠樻姤鍚嶈垂")]
+ [DisplayName("渚涘簲鍟嗚幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭�")]
[ApiDescriptionSettings(Name = "AddBaomingfei"), HttpPost]
- public async Task<bool> AddBaomingfei(SuplierBaomingfeiInput input)
+ public async Task<FBS_CusExtend> AddBaomingfei(SuplierBaomingfeiInput input)
{
@@ -212,67 +310,33 @@
}
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
-
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳借幏鍙栦唬鐞嗕汉鐨勬敮浠樹俊鎭紒");
+ }
+
var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
if (tenderOrder == null)
{
throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
}
-
-
- //if (tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
- //{
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
- if(tenderOrderBidding!=null && (tenderOrderBidding.IsTransfer.HasValue && tenderOrderBidding.IsTransfer.Value))
- {
- throw Oops.Oh("宸茬粡浠樻锛�");
- }
+ var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrder.CusExtendId ).FirstAsync();
+ var cusExtend1 = new FBS_CusExtend();
+ if (cusExtend != null)
+ {
+ cusExtend1.EnterpriseName = cusExtend.EnterpriseName;
+ cusExtend1.BankName = cusExtend.BankName;
+ cusExtend1.BankAccount = cusExtend.BankAccount;
+ cusExtend1.BankAccountIMG = cusExtend.BankAccountIMG;
+ }
- if (tenderOrderBidding == null)
- {
- tenderOrderBidding = new TenderOrderBidding();
- tenderOrderBidding.Id = Guid.NewGuid();
- tenderOrderBidding.TenderId = input.TenderOrderId;
- tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
- tenderOrderBidding.TransferTime = DateTime.Now;
- tenderOrderBidding.TransferNo = "BMF"+tenderOrderBidding.Id.ToString("N");
- tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
-
- tenderOrderBidding.CreateTime = DateTime.Now;
- tenderOrderBidding.CreateUserId = usertrueId;
- tenderOrderBidding.CreateUserName = RealName;
- tenderOrderBidding.UpdateTime = DateTime.Now;
- tenderOrderBidding.UpdateUserId = usertrueId;
- tenderOrderBidding.UpdateUserName = RealName;
- return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
- }
- else
- {
- tenderOrderBidding.IsTransfer = true;
- tenderOrderBidding.Zhifujine = tenderOrder.Baomingfei;
- tenderOrderBidding.TransferTime = DateTime.Now;
- tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
- tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
- tenderOrderBidding.UpdateTime = DateTime.Now;
- tenderOrderBidding.UpdateUserId = usertrueId;
- tenderOrderBidding.UpdateUserName = RealName;
- return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
- }
-
-
-
- //}
- //else
- //{
- // throw Oops.Oh("鏃犻渶鏀粯鎶ュ悕璐癸紒");
- //}
-
+ return cusExtend1;
}
-
@@ -293,22 +357,32 @@
{
usertrueId = userId;
}
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳戒笂浼犳嫑鏍囨枃浠讹紒");
+ }
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == userId).FirstAsync();
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
if(tenderOrder == null)
{
throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
}
- if(tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
- {
- if (tenderOrderBidding == null || (!tenderOrderBidding.IsTransfer.HasValue || tenderOrderBidding.IsTransfer.Value == false))
- {
- throw Oops.Oh("蹇呴』鍏堟敮浠樻墠鑳芥姇鏍囷紒");
- }
- }
+ //if(tenderOrder.Baomingfei.HasValue && tenderOrder.Baomingfei.Value > 0)
+ //{
+ // if (tenderOrderBidding == null || (!tenderOrderBidding.IsTransfer.HasValue || tenderOrderBidding.IsTransfer.Value == false))
+ // {
+ // throw Oops.Oh("蹇呴』鍏堟敮浠樻墠鑳芥姇鏍囷紒");
+ // }
+ //}
if(tenderOrderBidding == null)
{
@@ -325,6 +399,15 @@
tenderOrderBidding.UpdateTime = DateTime.Now;
tenderOrderBidding.UpdateUserId = usertrueId;
tenderOrderBidding.UpdateUserName = RealName;
+ tenderOrderBidding.CusExtendId = customerExId;
+ if( !tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value<=0)
+ {
+ tenderOrderBidding.IsTransfer = true;
+ tenderOrderBidding.Zhifujine = 0;
+ tenderOrderBidding.TransferTime = DateTime.Now;
+ tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ }
return await _TenderOrderBiddingRep.InsertAsync(tenderOrderBidding);
}
@@ -333,6 +416,14 @@
tenderOrderBidding.UpdateTime = DateTime.Now;
tenderOrderBidding.UpdateUserId = usertrueId;
tenderOrderBidding.UpdateUserName = RealName;
+ if (!tenderOrder.Baomingfei.HasValue || tenderOrder.Baomingfei.Value <= 0)
+ {
+ tenderOrderBidding.IsTransfer = true;
+ tenderOrderBidding.Zhifujine = 0;
+ tenderOrderBidding.TransferTime = DateTime.Now;
+ tenderOrderBidding.TransferNo = "BMF" + tenderOrderBidding.Id.ToString("N");
+ tenderOrderBidding.TradeNo = DateTimeOffset.Now.ToString("yyyyMMddHHmmssfff") + (new Random()).Next(100, 1000); // 璁㈠崟鍙�
+ }
return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding);
}
@@ -350,8 +441,11 @@
long userId = 0;
long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId);
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+
var query = _sqlSugarClient.Queryable<TenderOrderBidding, TenderOrder>((a, b) => a.TenderId == b.Id)
- .Where((a, b) => a.CreateUserId == userId)
+ .Where((a, b) => a.CusExtendId == customerExId)
.WhereIF(!string.IsNullOrWhiteSpace(input.ProjectName), (a, b) => b.ProjectName.Contains(input.ProjectName.Trim()))
.WhereIF(!string.IsNullOrWhiteSpace(input.Dailijigoumingcheng), (a, b) => b.Dailijigoumingcheng.Contains(input.Dailijigoumingcheng.Trim()))
@@ -393,4 +487,73 @@
return pagedList;
}
+
+
+
+
+ /// <summary>
+ /// 渚涘簲鍟嗕笅杞戒腑鏍囨枃浠� 鉃�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [DisplayName("渚涘簲鍟嗕笅杞戒腑鏍囨枃浠�")]
+ [ApiDescriptionSettings(Name = "DownZhongbiao"), HttpPost]
+ public async Task<TenderOrderOutput> DownZhongbiao(SuplierBaomingfeiInput input)
+ {
+
+
+ long userId = 0;
+ long? usertrueId = null;
+ if (long.TryParse(App.User?.FindFirst(ClaimConst.UserId)?.Value, out userId))
+ {
+ usertrueId = userId;
+ }
+
+ string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
+
+ if (CustomerLogoinType != "GYS")
+ {
+ throw Oops.Oh("鍙湁鐧诲綍瑙掕壊渚涘簲鍟嗘墠鑳戒笂浼犳嫑鏍囨枃浠讹紒");
+ }
+
+ long customerExId = 0;
+ long.TryParse(App.User?.FindFirst(ClaimConst.CustomerExId)?.Value, out customerExId);
+ var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
+
+
+
+
+
+ var tenderOrder = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.TenderOrderId).FirstAsync();
+ if (tenderOrder == null)
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎷涙爣锛�");
+ }
+ if(tenderOrder.OrderStatus !=3)
+ {
+ throw Oops.Oh("鍙湁涓爣涔嬪悗鎵嶈兘涓嬭浇涓爣鏂囦欢锛�");
+ }
+
+ var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CusExtendId == customerExId).FirstAsync();
+
+ if (tenderOrderBidding == null )
+ {
+ throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�");
+ }
+ if (!tenderOrderBidding.IsSelected.HasValue && tenderOrderBidding.IsSelected.Value)
+ {
+ throw Oops.Oh("娌℃湁涓爣锛�");
+ }
+ if (!tenderOrderBidding.IsDailiTransfer.HasValue && tenderOrderBidding.IsDailiTransfer.Value)
+ {
+ throw Oops.Oh("娌℃湁缂寸撼浠ｇ悊璐癸紒");
+ }
+
+ var tenderOrderOutput = new TenderOrderOutput();
+
+ tenderOrderOutput.Zhongbiaowenjian = tenderOrder.Zhongbiaowenjian;
+ tenderOrderOutput.ZhongbiaowenjianName = tenderOrder.ZhongbiaowenjianName;
+ return tenderOrderOutput;
+ }
+
}
--
Gitblit v1.9.1