11

REBORN.Model/Entity/Dmc/RB_Journey_Scenic.cs

@@ -194,5 +194,15 @@ namespace REBORN.Model.Entity.Dmc
         /// 是否默认景点展示图(1)
         /// </summary>
         public int DefaultNum { get; set; }
+
+        /// <summary>
+        /// 纬度
+        /// </summary>
+        public float Latitude { get; set; }
+
+        /// <summary>
+        /// 经度
+        /// </summary>
+        public float Longitude { get; set; }
     }
 }

REBORN.Model/Entity/Video/RB_Spider_Destination.cs

+using REBORN.Common.AOP;
+using System;
+
+namespace REBORN.Model.Entity.Video
+{
+    /// <summary>
+    /// 爬虫洲、国家、城市主表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "VideoConnection")]
+    public class RB_Spider_Destination
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 州、地区/国家、城市Id
+        /// </summary>
+        public string DId { get; set; }
+
+        /// <summary>
+        /// 州、地区/国家、城市 中文名称
+        /// </summary>
+        public string DName { get; set; }
+
+        /// <summary>
+        /// 州、地区/国家、城市 英文名称
+        /// </summary>
+        public string DEnName { get; set; }
+
+        /// <summary>
+        /// 类型(路书0-州，1-国家，2-城市)
+        /// </summary>
+        public int DType { get; set; }
+
+        /// <summary>
+        /// 来源(lushu)
+        /// </summary>
+        public string SourceType { get; set; }
+    }
+}

REBORN.Model/Entity/Video/RB_Spider_Flight.cs

-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using REBORN.Common.AOP;
+using REBORN.Common.AOP;
+using System;
 
 namespace REBORN.Model.Entity.Video
 {

REBORN.Model/Entity/Video/RB_Spider_Poi.cs

+using REBORN.Common.AOP;
+using System;
+
+namespace REBORN.Model.Entity.Video
+{
+    /// <summary>
+    /// POI资料库
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "VideoConnection")]
+    public class RB_Spider_Poi
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+ 
+        public int Id { get; set; }
+
+        /// <summary>
+        /// Poi编号
+        /// </summary>
+        public string SourceId { get; set; }
+
+        /// <summary>
+        /// Poi名称
+        /// </summary>
+        public string PoiName { get; set; }
+
+        /// <summary>
+        /// POI英文名称
+        /// </summary>
+        public string PoiEnName { get; set; }
+
+        public int SourceType { get; set; }
+
+        /// <summary>
+        /// 封面图
+        /// </summary>
+        public string CoverPic { get; set; }
+
+        public string Address { get; set; }
+
+        public float Latitude { get; set; }
+
+        public float Longitude { get; set; }
+
+        public string CityId { get; set; }
+
+        public string CityName { get; set; }
+
+        public string CityEnName { get; set; }
+
+        public string CountryId { get; set; }
+
+        public string CountryName { get; set; }
+
+        public string CountryEnName { get; set; }
+
+        /// <summary>
+        /// 描述
+        /// </summary>
+        public string Description { get; set; }
+
+        public string Phone { get; set; }
+
+        public string Website { get; set; }
+
+        public string Traffic { get; set; }
+
+        public string Opening { get; set; }
+
+        public string RecommendTime { get; set; }
+    }
+}

REBORN.Model/Extend/Video/RB_Spider_Destination_Extend.cs

+using REBORN.Model.Entity.Video;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace REBORN.Model.Extend.Video
+{
+    public class RB_Spider_Destination_Extend : RB_Spider_Destination
+    {
+    }
+}

REBORN.Model/Extend/Video/RB_Spider_Poi_Extend.cs

+using REBORN.Model.Entity.Video;
+
+namespace REBORN.Model.Extend.Video
+{
+    public class RB_Spider_Poi_Extend : RB_Spider_Poi
+    {
+        public string KeyWords { get; set; }
+    }
+}

REBORN.Model/REBORN.Model.csproj

@@ -777,9 +777,11 @@
     <Compile Include="Entity\User\Rb_Workflow_Audit.cs" />
     <Compile Include="Entity\User\Rb_Workflow_Askforleave.cs" />
     <Compile Include="Entity\User\RB_WorkdaySeting.cs" />
+    <Compile Include="Entity\Video\RB_Spider_Destination.cs" />
     <Compile Include="Entity\Video\RB_Spider_Flight.cs" />
     <Compile Include="Entity\Video\RB_Spider_FlightDetails.cs" />
     <Compile Include="Entity\Video\RB_Spider_Hotel.cs" />
+    <Compile Include="Entity\Video\RB_Spider_Poi.cs" />
     <Compile Include="Entity\Video\RB_Spider_Trip.cs" />
     <Compile Include="Entity\Video\RB_Video_Watch.cs" />
     <Compile Include="Entity\Video\RB_Video_Log.cs" />
@@ -1409,7 +1411,9 @@
     <Compile Include="Extend\User\Rb_Workflow_Audit_Extend.cs" />
     <Compile Include="Extend\User\Rb_Workflow_Askforleave_Extend.cs" />
     <Compile Include="Extend\User\RB_WorkdaySeting_Extend.cs" />
+    <Compile Include="Extend\Video\RB_Spider_Destination_Extend.cs" />
     <Compile Include="Extend\Video\RB_Spider_Hotel_Extend.cs" />
+    <Compile Include="Extend\Video\RB_Spider_Poi_Extend.cs" />
     <Compile Include="Extend\Video\RB_Video_Watch_Extend.cs" />
     <Compile Include="Extend\Video\RB_Video_Log_Extend.cs" />
     <Compile Include="Extend\Video\RB_Video_Like_Extend.cs" />

REBORN.Module.B2BModule/ProductModule.cs

@@ -1151,7 +1151,7 @@ namespace REBORN.Module.B2BModule
         /// <param name="Uid">点击账户Id</param>
         /// <param name="isGetPriceFlight">是否查询子项航班</param>
         /// <param name="isGetHistory">是否查询历史团期</param>
-        public Dictionary<string, object> GetB2BTravelInfoV1(int configId, int cityId = 0, int tcid = 0, int prview = 0, int isB2C = 0, int isApp = 0, int orderId = 0, TeamTypeEnum teamType = TeamTypeEnum.Normal, int isClick = 0, int sourceType = 1, int Uid = 0, bool isGetPriceFlight = false)
+        public Dictionary<string, object> GetB2BTravelInfoV1Module(int configId, int cityId = 0, int tcid = 0, int prview = 0, int isB2C = 0, int isApp = 0, int orderId = 0, TeamTypeEnum teamType = TeamTypeEnum.Normal, int isClick = 0, int sourceType = 1, int Uid = 0, bool isGetPriceFlight = false)
         {
             //基础数据组装
             GetBaseTravelInfo(configId, out RB_Travel_Config_Extend extModel, out RB_Line line, out RB_Lineteam lineTeam, out Dictionary<string, object> obj, TCID: tcid, isApp: isApp);
@@ -2628,7 +2628,7 @@ namespace REBORN.Module.B2BModule
         /// <param name="lineTeam">系列信息</param>
         /// <param name="obj">组装返回的数据</param>
         /// <param name="TCID">团期编号</param>
-        /// <param name="isFromTripDetails">是否是行程详细页面使用(http://192.168.10.68:8120/Home/TripDetails?ConfigId=9928)</param>
+        /// <param name="isFromTripDetails">是否是行程详细页面使用(http://192.168.5.214:8120/Home/TripDetails?ConfigId=9928)</param>
         private void GetBaseTravelInfo(int configId, out RB_Travel_Config_Extend extModel, out RB_Line line, out RB_Lineteam lineTeam, out Dictionary<string, object> obj, int TCID = 0, int isApp = 0, int isFromTripDetails = 0)
         {
             List<JourneyItem> dayList = new List<JourneyItem>();
@@ -2684,7 +2684,6 @@ namespace REBORN.Module.B2BModule
                     {
                         TripImageList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(feature?.TripImageList);
                     }
-
                 }
                 catch (Exception ex)
                 {
@@ -2727,7 +2726,6 @@ namespace REBORN.Module.B2BModule
                         {
                             TripImageList.Add(fItem.Url.Replace("http://", "https://"));
                         }
-
                     }
                 }
             }
@@ -2874,27 +2872,13 @@ namespace REBORN.Module.B2BModule
             List<RB_Lineteam_Discount> discountList = new RB_LineteamDiscountRepository().GetLineteamListByLtID(extModel.LineteamId ?? 0);
             //pdf下载名称
             string PdfDownLoadName = "";
-            if ((extModel?.LineId ?? 0) == 168 || (extModel?.LineId ?? 0) == 119)
+            if (lineTeam != null && !string.IsNullOrEmpty(lineTeam.LtName))
             {
-                if ((extModel?.Title ?? "").Length > Common.Config.PdfNameLength)
-                {
-                    PdfDownLoadName += (extModel?.Title ?? "").Substring(0, Common.Config.PdfNameLength);
-                }
-                else
-                {
-                    PdfDownLoadName += extModel?.Title ?? "";
-                }
+                PdfDownLoadName += (lineTeam?.LtName ?? "");
             }
-            else
+            if ((extModel?.DayNum ?? 0) > 0)
             {
-                if (lineTeam != null && !string.IsNullOrEmpty(lineTeam.LtName))
-                {
-                    PdfDownLoadName += (lineTeam?.LtName ?? "");
-                }
-                if ((extModel?.DayNum ?? 0) > 0)
-                {
-                    PdfDownLoadName += (extModel?.DayNum ?? 0) + "日游";
-                }
+                PdfDownLoadName += (extModel?.DayNum ?? 0) + "日游";
             }
 
             List<FileData> imgCoverList = new List<FileData>();
@@ -2941,7 +2925,7 @@ namespace REBORN.Module.B2BModule
                 { "ShopList", extModel.ShopList },
                 { "SelfpayingList", extModel.SelfpayingList },
                 { "LineId", extModel.LineId },
-                { "LineName",line==null?"":line.LineName },
+                { "LineName",(line?.LineName??"")},
                 { "LineShortName",(line?.LineShortName??"") },
                 { "LineteamId", extModel.LineteamId },
                 { "LtName",lineTeam.LtName},
@@ -2965,7 +2949,6 @@ namespace REBORN.Module.B2BModule
                 { "MapLevel",extModel.MapLevel},
                 { "MapUrl",extModel.MapUrl},
                 { "TeamType",extModel?.TeamType??0},
-
             };
             int FeaturePageType = 2;
             if ((extModel?.FeaturePageType ?? 1) == 1)
@@ -2986,13 +2969,11 @@ namespace REBORN.Module.B2BModule
                     {
                         zaoStr = zaoModel?.DinnerName ?? "";
                     }
-
                     var wuModel = dinnerList?.FirstOrDefault(qitem => qitem.UseDinnerType == "2");
                     if (!string.IsNullOrEmpty(wuModel?.DinnerName ?? ""))
                     {
                         wuStr = wuModel?.DinnerName ?? "";
                     }
-
                     var wanModel = dinnerList?.FirstOrDefault(qitem => qitem.UseDinnerType == "3");
                     if (!string.IsNullOrEmpty(wanModel?.DinnerName ?? ""))
                     {
@@ -3030,21 +3011,6 @@ namespace REBORN.Module.B2BModule
                             hotelName += str;
                             hIndex++;
                         }
-                        if (hotelList.Count > 0)
-                        {
-                            if (hotelList.Count == 1)
-                            {
-                                if (hotelList[0].HotelName != "温馨的家" && hotelList[0].HotelName != "机场附近酒店")
-                                {
-                                    if (hotelList[0].Status == REBORN.Common.Enum.JourneyStateEnum.Sure)
-                                    {
-                                        // HK 2023-11-16 OP要求去掉
-                                        hotelExt = "【保证入住】";
-                                    }
-                                }
-                            }
-                        }
-
                         if (string.IsNullOrEmpty(hotelName))
                         {
                             hotelName = "今日暂无酒店安排";

REBORN.Module.DMCModule/TicketCouponsModule.cs

 using REBORN.Common;
-using REBORN.Common.Enum;
 using REBORN.Common.Plugin;
 using REBORN.Model.Entity;
 using REBORN.Model.Entity.Dmc;
-using REBORN.Model.Extend;
 using REBORN.Model.Extend.Dmc;
+using REBORN.Model.Extend.Video;
 using REBORN.Repository;
 using REBORN.Repository.Dmc;
-using REBORN.ThirdCore.Oss;
+using REBORN.Repository.Video;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace REBORN.Module.DMCModule
 {
@@ -33,6 +30,11 @@ namespace REBORN.Module.DMCModule
         /// </summary>
         private readonly DMCPictureModule pictureModule = new DMCPictureModule();
 
+        /// <summary>
+        /// POI仓储层对象
+        /// </summary>
+        private readonly RB_Spider_PoiRepository spider_PoiRepository = new RB_Spider_PoiRepository();
+
         /// <summary>
         /// 适用于下拉列表
         /// </summary>
@@ -53,6 +55,16 @@ namespace REBORN.Module.DMCModule
             return repository.GetLineScienListRepository(where);
         }
 
+        /// <summary>
+        /// 获取POI列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Spider_Poi_Extend> GetPoiListModule(RB_Spider_Poi_Extend query)
+        {
+            return spider_PoiRepository.GetPoiListRepository(query);
+        }
+
         /// <summary>
         /// 获取景点分页列表（适用于PPT行程)
         /// </summary>

REBORN.Module.DMCModule/TravelModuleQuery.cs

@@ -3778,30 +3778,10 @@ namespace REBORN.Module.DMCModule
             Rb_hotelRepository hotelRepository = new Rb_hotelRepository();
             Rb_destinationRepository rb_DestinationRepository = new Rb_destinationRepository();
             extModel.TravelLngLat = new List<object>();
-            var hotelJourneyOrderList = new List<Rb_Hotel_JourneyOrder_Extend>();
+ 
             List<RB_Destination_Extend> destionationList = new List<RB_Destination_Extend>();
             List<RB_TicketCoupons> oldScenicList = new List<RB_TicketCoupons>();
-            //出境日本线、和日本当地游
-            if ((extModel.LineId == 14 || extModel.LineId == 118))
-            {
-                if (TCID > 0)
-                {
-                    hotelJourneyOrderList = journeyOrderRepository.GetListExt(new Rb_Hotel_JourneyOrder_Extend() { TCID = TCID }).OrderBy(qitem => qitem.UseDay).ToList();
-                }
-                else if (isFromTripDetails == 1 && TCID <= 0)
-                {
-                    var pList = priceRepository.GetTravelPriceListRepository(extModel.ID);
-                    if (pList != null && pList.Count == 1)
-                    {
-                        TCID = pList?.FirstOrDefault()?.TCID ?? 0;
-                        if (TCID > 0)
-                        {
-                            hotelJourneyOrderList = journeyOrderRepository.GetListExt(new Rb_Hotel_JourneyOrder_Extend() { TCID = TCID }).OrderBy(qitem => qitem.UseDay).ToList();
-                        }
-                    }
-                }
-            }
-
+     
             if (extModel.TrafficList != null || extModel.ScenicList != null || extModel.HotelList != null || extModel.DinnerList != null || extModel.FreedomList != null || extModel.WarmTipList != null)
             {
                 if (extModel.TrafficList != null && extModel.TrafficList.Count > 0)
@@ -4019,71 +3999,38 @@ namespace REBORN.Module.DMCModule
                                     Type = 3,
                                     Rank = Convert.ToInt32(item.Rank)
                                 };
-                                var currentHotel = hotelJourneyOrderList != null && hotelJourneyOrderList.Count > 0 ? hotelJourneyOrderList.Where(qitem => qitem.UseDay == item.DayNum && qitem.OldHotelID == item.HotelId).FirstOrDefault() : null;
+                                
                                 string StarStr = "";//几星級
                                 if (item.Star != null && item.Star > 0)
                                 {
                                     HotelStarEnum hotelStart = (HotelStarEnum)Convert.ToInt32(item.Star);
                                     StarStr = Common.Plugin.EnumHelper.GetEnumName(hotelStart);
                                 }
-                                //地接确认或OP确认，才保证入住
-                                if ((extModel.LineId == 14 || extModel.LineId == 118) && currentHotel != null && currentHotel.ID > 0 && (currentHotel.DMCState == 1 || currentHotel.OPState == 1))
+                                childItem.childItem = new
                                 {
-                                    childItem.childItem = new
-                                    {
-                                        item.TimeType,
-                                        item.HotelName,
-                                        currentHotel.NewHotelName,
-                                        item.HotelProductName,
-                                        item.UseDinnerType,
-                                        item.HotelNewDescriptions,
-                                        HotelNewDescriptionText = StringHelper.AppHtmlFilterr(item.HotelNewDescriptions).Trim(),
-                                        item.Description,
-                                        DescriptionText = StringHelper.AppHtmlFilterr(item.Description),
-                                        item.ImaArray,
-                                        item.Url,
-                                        //确定
-                                        Status = 1,
-                                        PointArray = new string[2] { item.Lng ?? "", item?.Lat ?? "" },
-                                        item.Star,
-                                        StarStr,
-                                        item.FacilityServices,
-                                        item.HotelAddress,
-                                        item.CityName,
-                                        item.HotelImg,
-                                        item.IsSameLevel,
-                                    };
-                                    item.Status = JourneyStateEnum.Sure;
-                                    item.NewHotelName = currentHotel.NewHotelName;
-                                }
-                                else
-                                {
-                                    childItem.childItem = new
-                                    {
-                                        item.TimeType,
-                                        item.HotelName,
-                                        NewHotelName = "",
-                                        item.HotelProductName,
-                                        item.UseDinnerType,
-                                        item.HotelNewDescriptions,
-                                        HotelNewDescriptionText = StringHelper.AppHtmlFilterr(item.HotelNewDescriptions).Trim(),
-                                        item.Description,
-                                        DescriptionText = StringHelper.AppHtmlFilterr(item.Description),
-                                        item.ImaArray,
-                                        item.Url,
-                                        //暂定
-                                        Status = 0,
-                                        PointArray = new string[2] { item.Lng ?? "", item?.Lat ?? "" },
-                                        item.Star,
-                                        StarStr,
-                                        item.FacilityServices,
-                                        item.HotelAddress,
-                                        item.CityName,
-                                        item.HotelImg,
-                                        item.IsSameLevel,
-                                    };
-                                    item.Status = JourneyStateEnum.NotSure;
-                                }
+                                    item.TimeType,
+                                    item.HotelName,
+                                    NewHotelName = "",
+                                    item.HotelProductName,
+                                    item.UseDinnerType,
+                                    item.HotelNewDescriptions,
+                                    HotelNewDescriptionText = StringHelper.AppHtmlFilterr(item.HotelNewDescriptions).Trim(),
+                                    item.Description,
+                                    DescriptionText = StringHelper.AppHtmlFilterr(item.Description),
+                                    item.ImaArray,
+                                    item.Url,
+                                    //暂定
+                                    Status = 0,
+                                    PointArray = new string[2] { item.Lng ?? "", item?.Lat ?? "" },
+                                    item.Star,
+                                    StarStr,
+                                    item.FacilityServices,
+                                    item.HotelAddress,
+                                    item.CityName,
+                                    item.HotelImg,
+                                    item.IsSameLevel,
+                                };
+                                item.Status = JourneyStateEnum.NotSure;
                                 childItems.Add(childItem);
                             }
                         }

REBORN.Repository/Dmc/RB_Journey_ScenicRepository.cs

@@ -51,9 +51,12 @@ namespace REBORN.Repository.Dmc
         {
             StringBuilder sb = new StringBuilder();
             sb.AppendFormat(@" 
-SELECT js.*,tc.Url,IFNULL(tc.Lat,'') AS Lat,IFNULL(tc.Lng,'') AS Lng,IFNULL(tc.Address,'') AS Address,IFNULL(tc.TrafficInfo,'') AS TrafficInfo
-FROM {0} js left join {1} tc on js.{2}=tc.{3} 
-WHERE 1=1 ", TableName, TableTicketCoupons, nameof(Model.Entity.Dmc.RB_Journey_Scenic.CouponsId), nameof(Model.Entity.RB_TicketCoupons.ID));
+SELECT js.*,tc.Url
+,(CASE WHEN js.CouponsId=0 THEN js.Latitude  ELSE IFNULL(tc.Lat,'') END)AS Lat
+,(CASE WHEN js.CouponsId=0 THEN js.Longitude ELSE IFNULL(tc.Lng,'') END)AS Lng
+,IFNULL(tc.Address,'') AS Address,IFNULL(tc.TrafficInfo,'') AS TrafficInfo
+FROM RB_Journey_Scenic js left join RB_TicketCoupons tc on js.CouponsId=tc.ID 
+WHERE 1=1 ");
             sb.AppendFormat(" AND js.{0}={1} ", nameof(RB_Journey_Scenic_Extend.Status), (int)Common.Enum.DateStateEnum.Normal);
             if (where != null)
             {
@@ -112,8 +115,8 @@ WHERE 1=1 ", TableName, TableTicketCoupons, nameof(Model.Entity.Dmc.RB_Journey_S
         public bool BatchReplaceJourneyScenicRepository(List<RB_Journey_Scenic_Extend> list, IDbTransaction transaction = null)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append(" REPLACE INTO RB_Journey_Scenic (ID,ConfigId,JourneyDate,DayNum,TimeType,CouponsId,CouponsTicketId,PlayTimeHour,PlayTimeMinutes,Description,CityId,ScenicImg,Status,Rank,CouponsName,CouponsTicketName,QCity,NewScenicImg,CityName,ScenicJsonStr,MD5Sign,TrafficType,TrafficContent,TrafficImage,TimeStr,DefaultNum) ");
-            builder.Append("                         VALUES(@ID,@ConfigId,@JourneyDate,@DayNum,@TimeType,@CouponsId,@CouponsTicketId,@PlayTimeHour,@PlayTimeMinutes,@Description,@CityId,@ScenicImg,@Status,@Rank,@CouponsName,@CouponsTicketName,@QCity,@NewScenicImg,@CityName,@ScenicJsonStr,@MD5Sign,@TrafficType,@TrafficContent,@TrafficImage,@TimeStr,@DefaultNum); ");
+            builder.Append(" REPLACE INTO RB_Journey_Scenic (ID,ConfigId,JourneyDate,DayNum,TimeType,CouponsId,CouponsTicketId,PlayTimeHour,PlayTimeMinutes,Description,CityId,ScenicImg,Status,Rank,CouponsName,CouponsTicketName,QCity,NewScenicImg,CityName,ScenicJsonStr,MD5Sign,TrafficType,TrafficContent,TrafficImage,TimeStr,DefaultNum,Latitude,Longitude) ");
+            builder.Append("                         VALUES(@ID,@ConfigId,@JourneyDate,@DayNum,@TimeType,@CouponsId,@CouponsTicketId,@PlayTimeHour,@PlayTimeMinutes,@Description,@CityId,@ScenicImg,@Status,@Rank,@CouponsName,@CouponsTicketName,@QCity,@NewScenicImg,@CityName,@ScenicJsonStr,@MD5Sign,@TrafficType,@TrafficContent,@TrafficImage,@TimeStr,@DefaultNum,@Latitude,@Longitude); ");
             bool flag = Execute(builder.ToString(), list, transaction) > 0;
             return flag;
         }

REBORN.Repository/REBORN.Repository.csproj

@@ -800,7 +800,9 @@
     <Compile Include="User\Rb_roleRepository.cs" />
     <Compile Include="User\Rb_sys_menuRepository.cs" />
     <Compile Include="User\Rb_sys_versionsRepository.cs" />
+    <Compile Include="Video\RB_Spider_DestinationRepository.cs" />
     <Compile Include="Video\RB_Spider_HotelRepository.cs" />
+    <Compile Include="Video\RB_Spider_PoiRepository.cs" />
     <Compile Include="Video\RB_Spider_TripRepository.cs" />
     <Compile Include="Video\RB_Video_CommentRepository.cs" />
     <Compile Include="Video\RB_Comment_LikeRepository.cs" />

REBORN.Repository/Video/RB_Spider_DestinationRepository.cs

+using Dapper;
+using REBORN.Model.Entity.Video;
+using REBORN.Model.Extend.Video;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace REBORN.Repository.Video
+{
+    /// <summary>
+    /// 爬虫洲、国家、城市仓储层
+    /// </summary>
+    public class RB_Spider_DestinationRepository : RepositoryBase<RB_Spider_Destination>
+    {
+        /// <summary>
+        /// 获取路书国家列表
+        /// </summary>
+        /// <returns></returns>
+        public List<RB_Spider_Destination_Extend> GetSpiderDestinationListRepository(RB_Spider_Destination_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            DynamicParameters parameters = new DynamicParameters();
+            builder.AppendFormat(@"
+SELECT DId,DName,DEnName
+FROM RB_Spider_Destination
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (query.DType > 0)
+                {
+                    builder.AppendFormat(" AND DType=@DType ");
+                    parameters.Add("@DType", query.DType);
+                }
+                if (!string.IsNullOrEmpty(query.SourceType))
+                {
+                    builder.AppendFormat(" AND SourceType=@SourceType ");
+                    parameters.Add("@SourceType", query.SourceType);
+                }
+            }
+            return Get<RB_Spider_Destination_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

REBORN.Repository/Video/RB_Spider_PoiRepository.cs

+using Dapper;
+using REBORN.Model.Entity.Video;
+using REBORN.Model.Extend.Video;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace REBORN.Repository.Video
+{
+    /// <summary>
+    /// 资料库仓储层
+    /// </summary>
+    public class RB_Spider_PoiRepository : RepositoryBase<RB_Spider_Poi>
+    {
+        /// <summary>
+        /// 获取资料库列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Spider_Poi_Extend> GetPoiListRepository(RB_Spider_Poi_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            DynamicParameters parameters = new DynamicParameters();
+            builder.AppendFormat(@"
+SELECT PoiName,CoverPic,CityName,CountryName,Description,Address,Latitude,Longitude 
+FROM rb_spider_poi
+WHERE 1=1 
+");
+            if (query != null)
+            {
+                if (!string.IsNullOrEmpty(query.CountryName))
+                {
+                    builder.AppendFormat(" AND CountryName=@CountryName ");
+                    parameters.Add("@CountryName", query.CountryName);
+                }
+                if (!string.IsNullOrEmpty(query.KeyWords))
+                {
+                    builder.AppendFormat(" AND PoiName LIKE @PoiName ");
+                    parameters.Add("@PoiName", "%"+query.KeyWords + "%");
+                }
+            }
+            builder.AppendFormat(" LIMIT 100; ");
+            return Get<RB_Spider_Poi_Extend>(builder.ToString(), parameters).ToList();
+        }
+    }
+}

REBORN.Services.B2BService/ProductService.cs

@@ -632,7 +632,6 @@ namespace REBORN.Services.B2BService
             {
                 return ApiResult.Failed("查询信息不存在");
             }
-            //if (pType == 1) { TCID = 0; }//b2c端  查询所有的
 
             //默认销售
             int sourceType = 1;
@@ -675,7 +674,7 @@ namespace REBORN.Services.B2BService
             }
             else
             {
-                var model = productModule.GetB2BTravelInfoV1(configId: id, cityId: string.IsNullOrWhiteSpace(cityId) ? 0 : Convert.ToInt32(cityId), tcid: TCID, prview: preview, isB2C: pType, isApp: isApp, teamType: (TeamTypeEnum)teamType, sourceType: sourceType, Uid: Uid, isGetPriceFlight: isGetPriceFlight);
+                var model = productModule.GetB2BTravelInfoV1Module(configId: id, cityId: string.IsNullOrWhiteSpace(cityId) ? 0 : Convert.ToInt32(cityId), tcid: TCID, prview: preview, isB2C: pType, isApp: isApp, teamType: (TeamTypeEnum)teamType, sourceType: sourceType, Uid: Uid, isGetPriceFlight: isGetPriceFlight);
                 var rlist = JsonHelper.GetCamelCaseResultJson(model);
                 if (preview == 0 && !string.IsNullOrEmpty(cacheKey))
                 {
@@ -723,7 +722,7 @@ namespace REBORN.Services.B2BService
             {
                 activityList = new List<RB_Travel_Activity>();
             }
-            var model = productModule.GetB2BTravelInfoV1(configId: id, cityId: string.IsNullOrWhiteSpace(cityId) ? 0 : Convert.ToInt32(cityId), tcid: TCID, prview: preview, isApp: isApp, teamType: (TeamTypeEnum)teamType);
+            var model = productModule.GetB2BTravelInfoV1Module(configId: id, cityId: string.IsNullOrWhiteSpace(cityId) ? 0 : Convert.ToInt32(cityId), tcid: TCID, prview: preview, isApp: isApp, teamType: (TeamTypeEnum)teamType);
             var result = new
             {
                 activityList,

REBORN.Services.DMCService/TicketCouponsService.cs

@@ -7,10 +7,12 @@ using REBORN.Common.Enum.Dmc;
 using REBORN.Common.Plugin;
 using REBORN.Model.Extend;
 using REBORN.Model.Extend.Dmc;
+using REBORN.Model.Extend.Video;
 using REBORN.Model.Query.Dmc;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Policy;
 
 namespace REBORN.Services.DMCService
 {
@@ -155,6 +157,44 @@ namespace REBORN.Services.DMCService
             return ApiResult.Success("", dataList);
         }
 
+        /// <summary>
+        /// 获取POI列表
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public virtual ApiResult GetPoiList(RequestParm request)
+        {
+            JObject parm = JObject.Parse(request.msg.ToString());
+            RB_Spider_Poi_Extend query = new RB_Spider_Poi_Extend()
+            {
+                CountryName = parm.GetStringValue("CountryName"),
+                KeyWords = parm.GetStringValue("KeyWords"),
+            };
+            var dataList = module.GetPoiListModule(query);
+            List<object> list = new List<object>();
+            foreach (var item in dataList)
+            {
+                string newUrl = "";
+                if (!string.IsNullOrEmpty(item.CoverPic))
+                {
+                    Uri uri = new Uri(item.CoverPic);
+                    newUrl = uri.GetLeftPart(UriPartial.Path);
+                }
+                list.Add(new
+                {
+                    item.Address,
+                    item.PoiName,
+                    CoverPic= newUrl,
+                    item.CityName,
+                    item.CountryName,
+                    item.Description,
+                    item.Latitude,
+                    item.Longitude,
+                });
+            }
+            return ApiResult.Success(data: list);
+        }
+
         /// <summary>
         /// 适用于下拉列表(线路行程专用)
         /// </summary>

REBORN.WebApi/AppStting/ticketcouponssetting.json

@@ -47,6 +47,11 @@
     "fullName": "REBORN.Services.DMCService.TicketCouponsService",
     "method": "GetLineScienList"
   },
+  {
+    "cmd": "ticketcoupons_post_GetPoiList", //获取POI列表
+    "fullName": "REBORN.Services.DMCService.TicketCouponsService",
+    "method": "GetPoiList"
+  },
   {
     "cmd": "ticketcoupons_post_GetLineScienPage", //PPT行程景点POI
     "fullName": "REBORN.Services.DMCService.TicketCouponsService",