From 711fc30d62069784f461426d8c00a30dfd54e1a9 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 17 十二月 2025 12:14:11 +0800
Subject: [PATCH] 20251217 逾期款项列表的“未收款金额”下面加个合计

---
 CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
index d93cda7..b4b4236 100644
--- a/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
+++ b/CY_ECommercePlatform/CY.BLL/OA/CoreDeliverOrderBLL.cs
@@ -177,7 +177,7 @@
                 Condition += " and  b.shipAddress = '" + 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
             {
@@ -238,7 +245,7 @@
                 Condition += " and  b.shipAddress = '" + shipAddress + "'";
 
             if (!string.IsNullOrEmpty(BuyerName))
-                Condition += " and  c.BuyerName like '%" + BuyerName + "%'";
+                Condition += " and  c.Keyid  = '" + BuyerName + "'";
 
 
             if (!string.IsNullOrEmpty(createTimeStart))

--
Gitblit v1.9.1