From 5912136732413c3e122102bdef8964b5152d8b25 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Wed, 7 Feb 2024 12:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=82=E5=B8=B8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=A4=84?=
 =?UTF-8?q?=E7=90=86OrderCost=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Server.Business/Order/OrderBusiness.cs               | 2 +-
 BBWY.Server.Business/Statistics/StatisticsBusiness.cs     | 3 ++-
 BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/BBWY.Server.Business/Order/OrderBusiness.cs b/BBWY.Server.Business/Order/OrderBusiness.cs
index 4b753c32..73aa3703 100644
--- a/BBWY.Server.Business/Order/OrderBusiness.cs
+++ b/BBWY.Server.Business/Order/OrderBusiness.cs
@@ -89,7 +89,7 @@ namespace BBWY.Server.Business
                                         (o, ocs, oct, sh) => (o.OrderState != Enums.OrderState.已取消 &&
                                                               o.StorageType != Enums.StorageType.SD &&
                                                               o.StorageType != null &&
-                                                                (oct.PurchaseAmount == 0M || oct.Profit < 0)) ||
+                                                                (SqlExt.IsNull(oct.PurchaseAmount, 0) == 0M || SqlExt.IsNull(oct.Profit, 0) < 0)) ||
                                                              (o.StorageType == null &&
                                                               !filterExceptionStateList.Contains(o.OrderState)))
                                .WhereIf(searchOrderRequest.OnlyDF, (o, ocs, oct, sh) => o.StorageType == Enums.StorageType.代发)
diff --git a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
index 42a11be3..b6b92d09 100644
--- a/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
+++ b/BBWY.Server.Business/Statistics/StatisticsBusiness.cs
@@ -5,6 +5,7 @@ using BBWY.Server.Model;
 using BBWY.Server.Model.Db;
 using BBWY.Server.Model.Db.Mds;
 using BBWY.Server.Model.Dto;
+using FreeSql;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -380,7 +381,7 @@ namespace BBWY.Server.Business
                                                             ((o.OrderState != Enums.OrderState.已取消 &&
                                                              o.StorageType != Enums.StorageType.SD &&
                                                              o.StorageType != null &&
-                                                             (oc.PurchaseAmount == 0M || oc.Profit < 0)) ||
+                                                             (SqlExt.IsNull(oc.PurchaseAmount, 0) == 0M || SqlExt.IsNull(oc.Profit, 0) < 0)) ||
                                                              (o.StorageType == null &&
                                                               !filterExceptionStateList.Contains(o.OrderState)))).Count();
 
diff --git a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
index 65bf22e6..47ca95ae 100644
--- a/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
+++ b/BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs
@@ -58,11 +58,12 @@ namespace BBWY.Server.Model.Dto
         /// </summary>
         public bool ExcludeCanceled { get; set; }
 
-        /// <summary>
-        /// 是否包含售后单
-        /// </summary>
+       
         //public bool? IsContainsAfterSaleOrder { get;set; }
 
+        /// <summary>
+        /// 是否包含异常单
+        /// </summary>
         public bool IncludeExceptionOrder { get; set; }
 
         /// <summary>