From cf60e8a9b913cc59bd2ac4edd9c7600d27a41038 Mon Sep 17 00:00:00 2001 From: shanj <18996038927@163.com> Date: Mon, 31 Jul 2023 15:09:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E5=B8=83=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=95=99=E8=A8=80=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/BaseApiController.cs | 6 +++++ .../Controllers/OrderMessageController.cs | 14 ++++++++++- .../Order/Message/OrderMessageBusiness.cs | 23 +++++++++++++------ BBWYB.Server.Model/Db/Order/Order.cs | 5 ++++ BBWYB.Server.Model/Db/Order/OrderMessage.cs | 3 +++ .../Request/Order/AddOrderMessageRequest.cs | 6 ----- 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/BBWYB.Server.API/Controllers/BaseApiController.cs b/BBWYB.Server.API/Controllers/BaseApiController.cs index 27be7be..283c4fe 100644 --- a/BBWYB.Server.API/Controllers/BaseApiController.cs +++ b/BBWYB.Server.API/Controllers/BaseApiController.cs @@ -26,5 +26,11 @@ namespace BBWYB.Server.API.Controllers httpContextAccessor.HttpContext.Request.Headers.TryGetValue("Authorization", out StringValues token); return token; } + + protected string GetClientCode() + { + httpContextAccessor.HttpContext.Request.Headers.TryGetValue("ClientCode", out StringValues clientCode); + return clientCode; + } } } diff --git a/BBWYB.Server.API/Controllers/OrderMessageController.cs b/BBWYB.Server.API/Controllers/OrderMessageController.cs index 2606f9e..3c3f4c1 100644 --- a/BBWYB.Server.API/Controllers/OrderMessageController.cs +++ b/BBWYB.Server.API/Controllers/OrderMessageController.cs @@ -24,7 +24,8 @@ namespace BBWYB.Server.API.Controllers public void AddOrderMessage([FromBody] AddOrderMessageRequest request) { var token = GetToken(); - orderMessageBusiness.AddOrderMessage(request, token); + var clientCode = GetClientCode(); + orderMessageBusiness.AddOrderMessage(request, token, clientCode); } /// @@ -37,5 +38,16 @@ namespace BBWYB.Server.API.Controllers { return orderMessageBusiness.GetOrderMessageList(orderId); } + + /// + /// 批量查询订单留言 + /// + /// + /// + [HttpPost] + public IList GetOrdersMessageList([FromBody]string[] orderIds) + { + return orderMessageBusiness.GetOrderMessageList(orderIds); + } } } diff --git a/BBWYB.Server.Business/Order/Message/OrderMessageBusiness.cs b/BBWYB.Server.Business/Order/Message/OrderMessageBusiness.cs index 4542934..c65a7dc 100644 --- a/BBWYB.Server.Business/Order/Message/OrderMessageBusiness.cs +++ b/BBWYB.Server.Business/Order/Message/OrderMessageBusiness.cs @@ -15,14 +15,17 @@ namespace BBWYB.Server.Business this.mdsBusiness = mdsBusiness; } - public void AddOrderMessage(AddOrderMessageRequest request, string token) + public void AddOrderMessage(AddOrderMessageRequest request, string token, string clientCode) { if (string.IsNullOrEmpty(request.Message) || - string.IsNullOrEmpty(request.OrderId) || - string.IsNullOrEmpty(request.OrderSn) || - request.ShopId == null || - request.ShopId == 0) + string.IsNullOrEmpty(request.OrderId)) throw new BusinessException("留言信息不完整"); + if (string.IsNullOrEmpty(clientCode)) + throw new BusinessException("缺少客户端标识"); + + var order = fsql.Select(request.OrderId).ToOne(); + if (order == null) + throw new BusinessException("订单不存在"); var user = mdsBusiness.GetUserInfo(token); var om = new OrderMessage() @@ -33,8 +36,9 @@ namespace BBWYB.Server.Business CreatorName = user.UserName, Message = request.Message, OrderId = request.OrderId, - OrderSn = request.OrderSn, - ShopId = request.ShopId + OrderSn = order.OrderSn, + ShopId = order.ShopId, + From = clientCode }; fsql.Insert(om).ExecuteAffrows(); } @@ -43,5 +47,10 @@ namespace BBWYB.Server.Business { return fsql.Select().Where(om => om.OrderId == orderId).ToList(); } + + public IList GetOrderMessageList(string[] orderIds) + { + return fsql.Select().Where(om => orderIds.Contains(om.OrderId)).ToList(); + } } } diff --git a/BBWYB.Server.Model/Db/Order/Order.cs b/BBWYB.Server.Model/Db/Order/Order.cs index 8c3373d..e605da3 100644 --- a/BBWYB.Server.Model/Db/Order/Order.cs +++ b/BBWYB.Server.Model/Db/Order/Order.cs @@ -258,6 +258,11 @@ namespace BBWYB.Server.Model.Db [Column(MapType = typeof(int?))] public Enums.IntoStoreType? IntoStoreType { get; set; } + + /// + /// + /// + public int? IsSpecialOrder { get; set; } } } diff --git a/BBWYB.Server.Model/Db/Order/OrderMessage.cs b/BBWYB.Server.Model/Db/Order/OrderMessage.cs index 61ecf9f..cb9c0d8 100644 --- a/BBWYB.Server.Model/Db/Order/OrderMessage.cs +++ b/BBWYB.Server.Model/Db/Order/OrderMessage.cs @@ -30,6 +30,9 @@ namespace BBWYB.Server.Model.Db public long? ShopId { get; set; } + [Column(StringLength = 50)] + public string From { get; set; } + } } diff --git a/BBWYB.Server.Model/Dto/Request/Order/AddOrderMessageRequest.cs b/BBWYB.Server.Model/Dto/Request/Order/AddOrderMessageRequest.cs index 33663da..4588593 100644 --- a/BBWYB.Server.Model/Dto/Request/Order/AddOrderMessageRequest.cs +++ b/BBWYB.Server.Model/Dto/Request/Order/AddOrderMessageRequest.cs @@ -2,14 +2,8 @@ { public class AddOrderMessageRequest { - public DateTime? CreateTime { get; set; } - public string Message { get; set; } public string OrderId { get; set; } - - public string OrderSn { get; set; } - - public long? ShopId { get; set; } } }