From 39a3880bef8771deea3dc47464d355c9b53a3935 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 23 三月 2026 16:24:30 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
index 84c72d6..25ac75c 100644
--- a/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/EC/EC_OrderBasicBLL.cs
@@ -249,6 +249,17 @@
/// <summary>
+ /// 鏍规嵁缂栧彿鑾峰彇璁捐璁㈠崟淇℃伅
+ /// </summary>
+ /// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
+ /// <returns></returns>
+ public EC_OrderBasic SelectModelByxiadanId(int orderId)
+ {
+ return _eC_OrderBasicDAL.SelectModelByxiadanId(orderId);
+ }
+
+
+ /// <summary>
/// 鏍规嵁缂栧彿鑾峰彇璁㈠崟淇℃伅
/// </summary>
/// <param name="orderId">璁㈠崟鍞竴缂栧彿</param>
@@ -279,6 +290,17 @@
public IEnumerable<EC_OrderBasic> GetOrderByIds(string orderIds)
{
return _eC_OrderBasicDAL.GetOrderByIds(orderIds);
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁璁㈠崟缂栧彿鑾峰彇璁㈠崟
+ /// </summary>
+ /// <param name="orderIds">璁㈠崟缂栧彿</param>
+ /// <returns></returns>
+ public IEnumerable<EC_OrderBasic> GetOrderByPrintTypeId(int PrintTypeId, Guid MemberId)
+ {
+ return _eC_OrderBasicDAL.GetOrderByPrintTypeId(PrintTypeId, MemberId);
}
/// <summary>
@@ -591,9 +613,9 @@
/// </summary>
/// <param name="orderId"></param>
/// <returns></returns>
- public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator)
+ public bool UpShejiStatus(int Keyid, int ShejiStatus, string Operator, int XiadanKeyid)
{
- return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator);
+ return _eC_OrderExtendDAL.UpShejiStatus(Keyid, ShejiStatus, Operator, XiadanKeyid);
}
/// <summary>
@@ -705,6 +727,10 @@
{
Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
}
+ else if (DeliveryTime == "鏄庡ぉ閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=1 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=1 )";
+ }
}
@@ -799,7 +825,10 @@
{
Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=0 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=0 )";
}
-
+ else if (DeliveryTime == "鏄庡ぉ閫炬湡")
+ {
+ Condition += " and ( DATEDIFF(DAY,GETDATE(),ob.[DeliveryTime])<=1 or DATEDIFF(DAY,GETDATE(),oe.[DelayTime])<=1 )";
+ }
}
if (!string.IsNullOrEmpty(Province))
--
Gitblit v1.9.1