页面修改

Mall.Module.Product/OrderModule.cs

@@ -18,6 +18,7 @@ using Mall.Model.Extend.Education;
 using Mall.Model.Extend.Finance;
 using Mall.Model.Extend.GuideCar;
 using Mall.Model.Extend.Product;
+using Mall.Model.Extend.Reserve;
 using Mall.Model.Extend.User;
 using Mall.Module.User;
 using Mall.Repository;
@@ -13610,6 +13611,19 @@ namespace Mall.Module.Product
         public List<RB_Goods_OrderDetail_Extend> GetAppletGoodsWaitCommentPageList(int pageIndex, int pageSize, out long count, RB_Goods_OrderDetail_Extend demodel)
         {
             var list = goods_OrderDetailRepository.GetAppletGoodsWaitCommentPageList(pageIndex, pageSize, out count, demodel);
+            List<RB_Reserve_ServicePersonal_Extend> persionList = new List<RB_Reserve_ServicePersonal_Extend>();
+            if (list != null && list.Count > 0)
+            {
+                string persionIds = string.Join(",", list.Where(qitem => qitem.ServicepersonalId > 0).Select(qitem => qitem.ServicepersonalId));
+                if (!string.IsNullOrEmpty(persionIds))
+                {
+                    persionList= reserve_ServicePersonalRepository.GetServicePersonalList(new RB_Reserve_ServicePersonal_Extend()
+                    {
+                        QIds = persionIds
+                    });
+                }
+              
+            }
             foreach (var item in list)
             {
                 item.SpecificationList = new List<string>();
@@ -13617,6 +13631,10 @@ namespace Mall.Module.Product
                 {
                     item.SpecificationList = JsonConvert.DeserializeObject<List<string>>(item.Specification);
                 }
+                if (item.ServicepersonalId > 0)
+                {
+                    item.ServicepersonalName = persionList?.Where(qitem => qitem.ID == item.ServicepersonalId)?.FirstOrDefault()?.Name ?? "";
+                }
             }
             return list;
         }

Mall.WebApi/Controllers/Product/AppletOrderController.cs

@@ -1283,7 +1283,11 @@ namespace Mall.WebApi.Controllers.MallBase
                 x.CarColorName,
                 x.CarBrandName,
                 x.GuideName,
-                x.GuidePhoto
+                x.GuidePhoto,
+                x.ServiceDate,
+                x.ServiceTime,
+                x.ServicepersonalId,
+                x.ServicepersonalName,
             });
             return ApiResult.Success("", pagelist);
         }