From 66a1290f368df2f5f543e14fe6abf8b31bf76490 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 18 十二月 2025 14:20:24 +0800
Subject: [PATCH] 提交
---
CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index d93cda7..c069f65 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -174,10 +174,10 @@
}
if (!string.IsNullOrEmpty(shipAddress))
- Condition += " and b.shipAddress = '" + shipAddress + "'";
+ Condition += " and b.shipAddress like '%" + shipAddress + "%'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
@@ -193,7 +193,7 @@
{
new Criterion("", Condition),
- new Criterion("orderBy"," MakeTime desc ")
+ new Criterion("orderBy"," MakeTime ")
};
query.Criteria = criterias;
return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
@@ -213,7 +213,14 @@
if (!string.IsNullOrEmpty(OrderState))
{
- Condition += " and a.OrderState = " + OrderState + " ";
+ if (OrderState != "4")
+ {
+ Condition += " and a.OrderState = " + OrderState + " ";
+ }
+ else
+ {
+ Condition += " and a.OrderState in( 0,1 ) ";
+ }
}
else
{
@@ -235,17 +242,17 @@
}
if (!string.IsNullOrEmpty(shipAddress))
- Condition += " and b.shipAddress = '" + shipAddress + "'";
+ Condition += " and b.shipAddress like '%" + shipAddress + "%'";
if (!string.IsNullOrEmpty(BuyerName))
- Condition += " and c.BuyerName like '%" + BuyerName + "%'";
+ Condition += " and c.Keyid = '" + BuyerName + "'";
if (!string.IsNullOrEmpty(createTimeStart))
- Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeStart + "')<=0 ";
+ Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeStart + "')<=0 ";
if (!string.IsNullOrEmpty(createTimeEnd))
- Condition += " and DATEDIFF(day,a.[MakeTime],'" + createTimeEnd + "')>=0 ";
+ Condition += " and DATEDIFF(day,a.[OverTime],'" + createTimeEnd + "')>=0 ";
@@ -254,7 +261,7 @@
{
new Criterion("", Condition),
- new Criterion("orderBy"," MakeTime desc ")
+ new Criterion("orderBy"," OverTime desc ")
};
query.Criteria = criterias;
return _ICoreDeliverOrderDAL.SelectModelPage(query, pa);
--
Gitblit v1.9.1