From 2148031304bc6f0ebf89c9dfd13213c2ae767a6d Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Fri, 14 Jul 2023 16:40:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=BB=9F?=
=?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
BBWYB.Server.API/Controllers/OrderController.cs | 1 -
BBWYB.Server.Business/Order/OrderBusiness.cs | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs
index 7bebd65..958666a 100644
--- a/BBWYB.Server.API/Controllers/OrderController.cs
+++ b/BBWYB.Server.API/Controllers/OrderController.cs
@@ -140,7 +140,6 @@ namespace BBWYB.Server.API.Controllers
///
///
[HttpPost("{shopId}")]
- [AllowAnonymous]
public OrderCountByStateResponse StatisticsOrderCountByOrderState([FromRoute] long shopId)
{
return orderBusiness.StatisticsOrderCountByOrderState(shopId);
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index 77483b8..e28acec 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -599,7 +599,8 @@ namespace BBWYB.Server.Business
Enums.OrderState.已取消,
Enums.OrderState.已完成
};
- var orderCountGroup = fsql.Select().Where(o => !noOrderStateList.Contains(o.OrderState.Value))
+ var orderCountGroup = fsql.Select().Where(o => o.ShopId == shopId)
+ .Where(o => !noOrderStateList.Contains(o.OrderState.Value))
.GroupBy(o => o.OrderState)
.ToList(g => new
{
@@ -608,7 +609,8 @@ namespace BBWYB.Server.Business
});
var childSelect = fsql.Select().As("osku").Where(osku => osku.PackConfigState == Enums.PackConfigState.待配置);
- var waitConfigCount = fsql.Select().Where(o => !noOrderStateList.Contains(o.OrderState.Value))
+ var waitConfigCount = fsql.Select().Where(o => o.ShopId == shopId)
+ .Where(o => !noOrderStateList.Contains(o.OrderState.Value))
.Where(o => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
.Where(o => o.IsPurchased == true)
.Where(o => childSelect.Where(osku => osku.OrderId == o.Id).Any())