Browse Source

更新异常订单查询条件,处理OrderCost为空的情况

master
shanji 1 year ago
parent
commit
5912136732
  1. 2
      BBWY.Server.Business/Order/OrderBusiness.cs
  2. 3
      BBWY.Server.Business/Statistics/StatisticsBusiness.cs
  3. 7
      BBWY.Server.Model/Dto/Request/Order/SearchOrderRequest.cs

2
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.)

3
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();

7
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>

Loading…
Cancel
Save