Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -5863,7 +5863,7 @@ namespace Mall.Module.Product
             {
                 {nameof(RB_Goods_OrderDetail_Extend.ServicepersonalId),ServicepersonalId }
             };
-            return goods_OrderDetailRepository.Update(fileds, new WhereHelper(nameof(RB_Goods_OrderDetail_Extend.GoodsId), OrderId));
+            return goods_OrderDetailRepository.Update(fileds, new WhereHelper(nameof(RB_Goods_OrderDetail_Extend.OrderId), OrderId));
         }
 
         /// <summary>

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -749,7 +749,7 @@ namespace Mall.WebApi.Controllers.MallBase
         }
 
         /// <summary>
-        /// 线下服务下单
+        /// 修改订单线下服务人员
         /// </summary>
         /// <returns></returns>
         [HttpPost]

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -2000,6 +2000,7 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.CoverImagePath,
                     y.OrderType,
                     OrderTypeName = y.OrderType.GetEnumName(),
+                    y.GoodsId,
                     y.GoodsName,
                     y.ProductCode,
                     y.Final_Price,
@@ -2031,7 +2032,8 @@ namespace Mall.WebApi.Controllers.MallBase
                     y.ServiceDate,
                     y.ServiceTime,
                     y.GoodServiceTime,
-                    y.ServicepersonalName
+                    y.ServicepersonalName,
+                    y.ServicepersonalId,
                 }),
                 x.Consignee,
                 x.Mobile,
@@ -2054,6 +2056,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.SmallShopsId,
                 x.SmallShopsName,
                 CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
+                x.StoresId,
                 x.StoreName,
                 x.StoresAddress,
             });

Mall.WebApi/Controllers/User/MContentController.cs

 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
 using Mall.Common.API;
 using Mall.Model.Extend.User;
 using Mall.Module.User;
@@ -10,11 +9,7 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
 using Mall.Common.Plugin;
-using Mall.Common.Enum.User;
-using Mall.CacheManager.User;
 using Newtonsoft.Json.Linq;
-using Mall.Common;
-using Microsoft.AspNetCore.Authorization;
 using Mall.Model.Entity.User;
 using Mall.AOP;
 using Mall.Module.BaseSetUp;