调整发布订单留言接口

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;
+        }
     }
 }

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);
         }
 
         /// <summary>
@@ -37,5 +38,16 @@ namespace BBWYB.Server.API.Controllers
         {
             return orderMessageBusiness.GetOrderMessageList(orderId);
         }
+
+        /// <summary>
+        /// 批量查询订单留言
+        /// </summary>
+        /// <param name="orderIds"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public IList<OrderMessageResponse> GetOrdersMessageList([FromBody]string[] orderIds)
+        {
+            return orderMessageBusiness.GetOrderMessageList(orderIds);
+        }
     }
 }

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<Order>(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<OrderMessage>().Where(om => om.OrderId == orderId).ToList<OrderMessageResponse>();
         }
+
+        public IList<OrderMessageResponse> GetOrderMessageList(string[] orderIds)
+        {
+            return fsql.Select<OrderMessage>().Where(om => orderIds.Contains(om.OrderId)).ToList<OrderMessageResponse>();
+        }
     }
 }

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; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public int? IsSpecialOrder { get; set; }
     }
 
 }

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; }
+
     }
 
 }

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