费用审核

op费用名称显示

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -1347,6 +1347,14 @@ namespace OASystem.API.Controllers
 
                 var carFeeTypeItems = await _groupRepository.Query<Sys_SetData>(s => s.STid == 17 && s.IsDel == 0).ToListAsync();
 
+
+                /*
+                 * 车/导游地接 费用类型
+                 */
+                var carFeeItems = await _groupRepository.Query<Sys_SetData>(s => s.STid == 83 && s.IsDel == 0).ToListAsync();
+
+                var cityData = await _groupRepository.Query<Grp_NationalTravelFee>(s => s.IsDel == 0).ToListAsync();
+
                 /*
                  * 用户信息
                  */
@@ -1476,7 +1484,30 @@ namespace OASystem.API.Controllers
                                 }
 
 
-                                _detail.PriceNameContent = touristGuideGroundReservations.Area;
+                                bool isInt = int.TryParse(touristGuideGroundReservations.Area, out int cityId);
+
+                                if (isInt)
+                                {
+                                    var cityInfo = cityData.Find(it => it.Id == cityId);
+                                    if (cityInfo != null)
+                                    {
+                                        string nameContent = $@"{cityInfo.Country}-{cityInfo.City}({carFeeItems.Find(it=>it.Id == touristGuideGroundReservations.PriceType)?.Name ?? "Unkonwn"})";
+
+                                        _detail.PriceNameContent = nameContent;
+
+                                    }
+
+                                    
+                                }
+                                else
+                                {
+                                    _detail.PriceNameContent = touristGuideGroundReservations.Area;
+                                }
+
+                                
+
+
+                                
 
                                 List<Grp_CarTouristGuideGroundReservationsContent> touristGuideGroundReservationsContents = _CarTouristGuideGroundReservationsContent
                                     .Where(s => s.CTGGRId == touristGuideGroundReservations.Id && s.IsDel == 0 && s.Price != 0).ToList();