提交代码

Mall.Module.Product/GuideCarModule.cs

@@ -1440,7 +1440,22 @@ namespace Mall.Module.Product
         /// <returns></returns>
         public List<RB_GuideCar_Car_Extend> GetGuideCarList(RB_GuideCar_Car_Extend query)
         {
-            return GuideCarRepository.GetGuideCarCarList(query);
+            var list=  GuideCarRepository.GetGuideCarCarList(query);
+            if (list!=null&& list.Any())
+            {
+                List<RB_GuideCar_CarColor_Extend> listCarColor = CarColorRepository.GetCarColorList(new RB_GuideCar_CarColor_Extend { TenantId = query.TenantId, MallBaseId = query.MallBaseId, CardIds = string.Join(",", list.Select(x => x.ID)) });
+                if (listCarColor != null && listCarColor.Any())
+                {
+                    listCarColor.Where(x => !string.IsNullOrWhiteSpace(x.CarPic)).ToList().ForEach(x => x.PicList = JsonConvert.DeserializeObject<List<string>>(x.CarPic));
+                }
+                foreach (var item in list)
+                {
+                    item.ColorList = new List<RB_GuideCar_CarColor_Extend>();
+                    item.ColorList = listCarColor.Where(x => x.CarId == item.ID).ToList();
+
+                }
+            }
+            return list;
         }
 
         /// <summary>

Mall.WebApi/Controllers/Product/GuideCarController.cs

@@ -922,7 +922,7 @@ namespace Mall.WebApi.Controllers.MallBase
             query.TenantId = UserInfo.TenantId;
             query.MallBaseId = parms.MallBaseId;
             var list = guideCarModule.GetGuideCarList(query);
-            var result = list.Select(x => new { x.ID, x.Name, x.CarBrand, x.CarClass, x.CarLogo, x.ColorList, x.CarType });
+            var result = list.Select(x => new { x.ID, x.Name, x.CarBrand, x.CarClass, x.CarLogo, ColorList= x.ColorList.Select(y=>new {y.ColorName,y.PicList }), x.CarType });
             return ApiResult.Success("", result);
         }