From 003ac6f41bbf757600c44656da621fb847c9f67e Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Mon, 31 Jul 2023 15:30:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Controllers/OrderController.cs | 12 ++++++++-
BBWYB.Server.Business/Order/OrderBusiness.cs | 11 +++++++-
BBWYB.Server.Model/Db/Order/Order.cs | 3 ++-
.../Dto/Request/Order/QueryOrderRequest.cs | 25 +++++++++++++++----
.../Request/Order/SetSpecialOrderRequest.cs | 12 +++++++++
.../Dto/Response/Order/OrderResponse.cs | 5 ++++
6 files changed, 60 insertions(+), 8 deletions(-)
create mode 100644 BBWYB.Server.Model/Dto/Request/Order/SetSpecialOrderRequest.cs
diff --git a/BBWYB.Server.API/Controllers/OrderController.cs b/BBWYB.Server.API/Controllers/OrderController.cs
index 2f4d37f..538d1f8 100644
--- a/BBWYB.Server.API/Controllers/OrderController.cs
+++ b/BBWYB.Server.API/Controllers/OrderController.cs
@@ -151,7 +151,17 @@ namespace BBWYB.Server.API.Controllers
[AllowAnonymous]
public void QikuPublishOrderSkuPackConfigState([FromBody] QikuPublishOrderSkuPackConfigStateRequest request)
{
- orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+ orderBusiness.QikuPublishOrderSkuPackConfigState(request);
+ }
+
+ ///
+ /// 设置/取消特殊单
+ ///
+ ///
+ [HttpPost]
+ public void SetSpecialOrder([FromBody] SetSpecialOrderRequest request)
+ {
+ orderBusiness.SetSpecialOrder(request);
}
}
}
diff --git a/BBWYB.Server.Business/Order/OrderBusiness.cs b/BBWYB.Server.Business/Order/OrderBusiness.cs
index a304858..e889a35 100644
--- a/BBWYB.Server.Business/Order/OrderBusiness.cs
+++ b/BBWYB.Server.Business/Order/OrderBusiness.cs
@@ -136,7 +136,10 @@ namespace BBWYB.Server.Business
.WhereIf(request.StartDate != null, (o, ocs, oct) => o.StartTime >= request.StartDate)
.WhereIf(request.EndDate != null, (o, ocs, oct) => o.StartTime <= request.EndDate)
.WhereIf(!string.IsNullOrEmpty(request.ClientOrderId), (o, ocs, oct) => o.ClientOrderId == request.ClientOrderId)
- .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName);
+ .WhereIf(!string.IsNullOrEmpty(request.SourceShopName), (o, ocs, oct) => o.SourceShopName == request.SourceShopName)
+ .WhereIf(request.IsOnlyDisplaySpecialOrder == 1, (o, ocs, oct) => o.IsSpecialOrder == 1)
+ .WhereIf(request.IsOnlyDisplaySendQiYue == 1, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.发回齐越)
+ .WhereIf(request.IsOnlyDisplayPurchaserSendInStore == 1, (o, ocs, oct) => o.IntoStoreType == Enums.IntoStoreType.厂商代发入仓);
}
select = select.WhereIf(request.ShopId != null, (o, ocs, oct) => o.ShopId == request.ShopId);
@@ -180,6 +183,7 @@ namespace BBWYB.Server.Business
IsWaitPack = o.IsWaitPack,
IntoStoreType = o.IntoStoreType,
PayTime = o.PayTime,
+ IsSpecialOrder = o.IsSpecialOrder,
ContactName = ocs.ContactName,
Address = ocs.Address,
@@ -822,5 +826,10 @@ namespace BBWYB.Server.Business
{
qikuManager.QikuPublishOrderSkuPackConfigState(request);
}
+
+ public void SetSpecialOrder(SetSpecialOrderRequest request)
+ {
+ fsql.Update(request.OrderId).Set(o => o.IsSpecialOrder, request.IsSpecialOrder).ExecuteAffrows();
+ }
}
}
diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs
index e605da3..37cca53 100644
--- a/BBWYB.Server.Model/Db/Order/Order.cs
+++ b/BBWYB.Server.Model/Db/Order/Order.cs
@@ -260,8 +260,9 @@ namespace BBWYB.Server.Model.Db
public Enums.IntoStoreType? IntoStoreType { get; set; }
///
- ///
+ /// 是否为特殊单
///
+ [Column(DbType = "int(1)", IsNullable = true)]
public int? IsSpecialOrder { get; set; }
}
diff --git a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
index 36afa8f..7a0508d 100644
--- a/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
+++ b/BBWYB.Server.Model/Dto/Request/Order/QueryOrderRequest.cs
@@ -76,28 +76,43 @@
public bool IsWaitConfig { get; set; }
///
- /// 是否仅显示待采购超时,是=1否=0,只在订单状态为【待采购和部分采购】时生效
+ /// 是否仅显示待采购超时,是=1否=0,null则不处理该条件,只在订单状态为【待采购和部分采购】时生效
///
public int? IsOnlyDisplayPurchaseTimeOut { get; set; }
///
- /// 是否仅显示待发货超时,是=1否=0,只在订单状态为【待发货和部分发货】时生效
+ /// 是否仅显示待发货超时,是=1否=0,null则不处理该条件,只在订单状态为【待发货和部分发货】时生效
///
public int? IsOnlyDisplayDeliveryTimeout { get; set; }
///
- /// 是否仅显示待配置-需修改,是=1否=0,只在【IsWaitConfig=true】时生效
+ /// 是否仅显示待配置-需修改,是=1否=0,null则不处理该条件,只在【IsWaitConfig=true】时生效
///
public int? IsOnlyDisplayPackConfigEditState { get; set; }
///
- /// 是否仅显示配置超时,是=1否=0,只在【IsWaitConfig=true】时生效(优先)
+ /// 是否仅显示配置超时,是=1否=0,null则不处理该条件,只在【IsWaitConfig=true】时生效(优先)
///
public int? IsOnlyDisplayCerConfigTimeOut { get; set; }
///
- /// 是否仅显示核算超时,是=1否=0,只在订单状态为【待核算】时生效
+ /// 是否仅显示核算超时,是=1否=0,null则不处理该条件,只在订单状态为【待核算】时生效
///
public int? IsOnlyDisplayCheckComputationTimeOut { get; set; }
+
+ ///
+ /// 是否仅显示发回齐越,是=1否=0,null则不处理该条件
+ ///
+ public int? IsOnlyDisplaySendQiYue { get; set; }
+
+ ///
+ /// 是否仅显示厂家代发入仓,是=1否=0,null则不处理该条件
+ ///
+ public int? IsOnlyDisplayPurchaserSendInStore { get; set; }
+
+ ///
+ /// 是否仅显示特殊单,是=1否=0,null则不处理该条件
+ ///
+ public int? IsOnlyDisplaySpecialOrder { get; set; }
}
}
diff --git a/BBWYB.Server.Model/Dto/Request/Order/SetSpecialOrderRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/SetSpecialOrderRequest.cs
new file mode 100644
index 0000000..f2649a4
--- /dev/null
+++ b/BBWYB.Server.Model/Dto/Request/Order/SetSpecialOrderRequest.cs
@@ -0,0 +1,12 @@
+namespace BBWYB.Server.Model.Dto
+{
+ public class SetSpecialOrderRequest
+ {
+ public string OrderId { get; set; }
+
+ ///
+ /// 是=1 否=1
+ ///
+ public int IsSpecialOrder { get; set; }
+ }
+}
diff --git a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
index b4b50ff..5943840 100644
--- a/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
+++ b/BBWYB.Server.Model/Dto/Response/Order/OrderResponse.cs
@@ -156,6 +156,11 @@
public Enums.AutoEditOrderPriceType? IsAutoEditOrderPrice { get; set; }
public IList OrderMessageList { get; set; }
+
+ ///
+ /// 是否为特殊单 是=1 否=0
+ ///
+ public int? IsSpecialOrder { get; set; }
}
public class OrderListResponse