From 5782e6fb084441dcf26db0b1aaf33e39204142b8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 15 四月 2025 08:52:33 +0800
Subject: [PATCH] 20250220设计订单菜单 会员菜单下 设计管理 12 会员菜单下 设计管理 01 会员菜单下 设计管理下 设计记件 /Pages/business/ShejijijianList.aspx 05 会员菜单下 设计管理下 新增订单 /Pages/business/ShejiOrderEdit.aspx 01 会员菜单下 设计管理下 订单管理 /Pages/business/ShejiOrderList.aspx 02
---
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 170 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 167 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 65b036e..deab199 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -76,6 +76,18 @@
/// <summary>
+ /// 鍒嗛〉鏌ヨ
+ /// </summary>
+ /// <param name="pagination"></param>
+ /// <param name="MemberId"></param>
+ /// <returns></returns>
+ public IEnumerable<Model.EC_OrderBasic> SelectModelPageSheji(Infrastructure.Query.Pagination pagination, Guid MemberId, string BeginCreateTime, string EndCreateTime, string SellerOrderId, string PrintTypeId, string BusinessManagerId, string Shejirenyuan, string BuyerName, string DocumentName, string ShejiStatus)
+ {
+ return _eC_OrderBasicDAL.SelectModelPageSheji(pagination, MemberId, BeginCreateTime, EndCreateTime, SellerOrderId, PrintTypeId, BusinessManagerId, Shejirenyuan, BuyerName, DocumentName, ShejiStatus);
+ }
+
+
+ /// <summary>
/// 浣滀笟鏈�佽揣鍒嗛〉鏌ヨ
/// </summary>
/// <param name="pagination"></param>
@@ -213,6 +225,30 @@
return _eC_OrderBasicDAL.SelectModelById(orderId);
}
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+ /// <returns></returns>
+ public Pay_TradingSingle GetPayTradingById(int orderId)
+ {
+ return _pay_TradingSingleDAL.GetOrderByIds(orderId).FirstOrDefault();
+ }
+
+
+
+
+ /// <summary>
+ /// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+ /// <returns></returns>
+ public EC_OrderExtend GetModelByKeyid(int orderId)
+ {
+ return _eC_OrderExtendDAL.GetModelByKeyid(orderId);
+ }
+
/// <summary>
/// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
/// </summary>
@@ -295,6 +331,18 @@
public bool ReceiveMoneyToAccount(int orderId, OA_FirmAccountRecord firmAccountRecord)
{
return _eC_OrderBasicDAL.ReceiveMoneyToAccount(orderId, firmAccountRecord);
+ }
+
+
+ /// <summary>
+ /// 鏀舵(绾夸笅杞处銆佺幇閲�)
+ /// </summary>
+ /// <param name="orderId">璁㈠崟缂栧彿</param>
+ /// <param name="firmAccountRecord">鎿嶄綔璁板綍</param>
+ /// <returns></returns>
+ public bool ReceiveMoneyToQueren(int orderId, OA_FirmAccountRecord firmAccountRecord)
+ {
+ return _eC_OrderBasicDAL.ReceiveMoneyToQueren(orderId, firmAccountRecord);
}
/// <summary>
@@ -451,9 +499,9 @@
/// <param name="OutOrderId"></param>
/// <param name="RelationType"></param>
/// <returns></returns>
- public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType)
+ public IEnumerable<EC_OrderBasic> SelectAferOfOutOrder(Infrastructure.Query.Pagination pagination, Guid MemberId, DateTime? StartCreatTime, DateTime? EndCreatTime, DateTime? StartReturnTime, DateTime? EndReturnTime, string Creater, string OutFirm, string WorkStates, string OutOrderId, int? RelationType, string PayState = null)
{
- return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType);
+ return _eC_OrderBasicDAL.SelectAferOfOutOrder(pagination, MemberId, StartCreatTime, EndCreatTime, StartReturnTime, EndReturnTime, Creater, OutFirm, WorkStates, OutOrderId, RelationType, PayState);
}
/// <summary>
@@ -517,6 +565,16 @@
}
/// <summary>
+ /// 鍒ゆ柇鏌愯鍗曟槸鍚︽槸鍙︿竴璁㈠崟鐨勮嚜鍔ㄥ鍗忚鍗�
+ /// </summary>
+ /// <param name="orderId"></param>
+ /// <returns></returns>
+ public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
+ {
+ return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator);
+ }
+
+ /// <summary>
/// WEB鏈嶅姟鑷姩瀹屾垚璁㈠崟
/// </summary>
public void AutoCompleteOrderByWebService()
@@ -533,6 +591,18 @@
{
return _eC_OrderBasicDAL.DeleteOutOrder(OrderId);
}
+
+
+ /// <summary>
+ /// 鍒犻櫎澶栧崗璁㈠崟
+ /// </summary>
+ /// <param name="OrderId"></param>
+ /// <returns></returns>
+ public bool UpdateOldOrderSurplusPrintNum(int outOrderId)
+ {
+ return _eC_OrderBasicDAL.UpdateOldOrderSurplusPrintNum(outOrderId);
+ }
+
/// <summary>
/// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��
@@ -563,7 +633,7 @@
/// <returns></returns>
public IEnumerable<EC_OrderBasic> GetModelPageListForPrepayments(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
{
- string Condition = " and ( ob.[OrderState] ='2' or ob.[OrderState] ='3' and SellerId='"+ SellerId + "' )";
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' ) and SellerId='" + SellerId + "' ";
if (!string.IsNullOrEmpty(DeliveryTime))
{
@@ -650,6 +720,100 @@
+ /// <summary>
+ /// 鏌ヨ瀹㈡埛棰勪粯娆惧垪琛�
+ /// </summary>
+ /// <param name="pa"></param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetModelPageListForSonghuoyanchis(Pagination pa, string DeliveryTime, string Province, string City, string County, string BuyerName, string BusinessManagerId, string SellerOrderId, string DocumentName, Guid SellerId)
+ {
+ string Condition = " and ( ob.[OrderState] ='1' or ob.[OrderState] ='2' or ob.[OrderState] ='3' or ob.[OrderState] ='4' ) and SellerId='" + SellerId + "' ";
+
+ if (!string.IsNullOrEmpty(DeliveryTime))
+ {
+ if (DeliveryTime == "鏄庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=1 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=1 )";
+ }
+ else if (DeliveryTime == "鍚庡ぉ")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=2 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=2 )";
+ }
+ else if (DeliveryTime == "3澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=3 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=3 )";
+ }
+ else if (DeliveryTime == "4澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=4 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=4 )";
+ }
+ else if (DeliveryTime == "5澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=5 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=5) ";
+ }
+ else if (DeliveryTime == "6澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=6 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=6) ";
+ }
+ else if (DeliveryTime == "7澶�")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])=7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])=7 )";
+ }
+ else if (DeliveryTime == "涓�鍛ㄥ悗")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime]) >7 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])>7 )";
+ }
+ else if (DeliveryTime == "閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
+ }
+
+ }
+
+ if (!string.IsNullOrEmpty(Province))
+ Condition += string.Format(" and CustomerCommunications.Province='{0}'", Province);
+
+ if (!string.IsNullOrEmpty(City))
+ Condition += string.Format(" and CustomerCommunications.City='{0}'", City);
+
+ if (!string.IsNullOrEmpty(County))
+ Condition += string.Format(" and CustomerCommunications.County='{0}'", County);
+
+ if (!string.IsNullOrEmpty(BuyerName))
+ {
+ Condition += " and ob.BuyerName like '%" + BuyerName + "%'";
+ }
+ if (!string.IsNullOrEmpty(BusinessManagerId))
+ {
+ Condition += string.Format(" and oe.BusinessManagerId='{0}'", BusinessManagerId);
+ }
+
+
+
+ if (!string.IsNullOrEmpty(SellerOrderId))
+ {
+ Condition += " and ob.SellerOrderId like '%" + SellerOrderId + "%'"; ;
+ }
+ if (!string.IsNullOrEmpty(DocumentName))
+ {
+ Condition += " and ob.DocumentName like '%" + DocumentName + "%'"; ;
+ }
+
+
+ Query query = new Query();
+ IList<Criterion> criterias = new List<Criterion>()
+ {
+ new Criterion("", Condition),
+
+ new Criterion("orderBy"," [DeliveryTime] DESC ")
+ };
+ query.Criteria = criterias;
+ return _eC_OrderBasicDAL.SelectModelPage_weiwangong(query, pa);
+ }
+
+
+
+
/// <summary>
/// 鏍规嵁鏂板璁㈠崟鎿嶄綔锛屽苟淇敼璁㈠崟鐘舵��
--
Gitblit v1.9.1