11

REBORN.Module.SellModule/SellOrderModule.cs

@@ -18868,10 +18868,11 @@ namespace REBORN.Module.SellModule
 
                 //出境合同
                 var contractList = contractRepository.GetContractListRepository("", OrderStr);
- 
+
 
                 //其它合同
-                var otherContractList = travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
+                var otherContractList = new List<RB_Travel_Contract_Extend>();
+                otherContractList= travel_ContractRepository.GetTravelContractListNewRepository(new RB_Travel_Contract_Extend() { QOrderIds = OrderStr, Status = -1 });
 
                 #region 同行联系人LD
                 var customerChildList = new List<Rb_Customer_InfoChildren>();

REBORN.Repository/Video/RB_Spider_PoiRepository.cs

@@ -22,10 +22,12 @@ namespace REBORN.Repository.Video
             StringBuilder builder = new StringBuilder();
             DynamicParameters parameters = new DynamicParameters();
             builder.AppendFormat(@"
-SELECT PoiName,CoverPic,CityName,CountryName,Description,Address,Latitude,Longitude 
+SELECT PoiName,CoverPic,CityName,CountryName,Description,Address,Latitude,Longitude
+       ,MATCH(PoiName,PoiEnName) AGAINST(@keyword IN BOOLEAN MODE) score
 FROM rb_spider_poi
-WHERE 1=1 
+WHERE 1=1 AND MATCH(PoiName,PoiEnName) AGAINST(@keyword IN BOOLEAN MODE)
 ");
+            parameters.Add("@keyword", query.KeyWords.Trim());
             if (query != null)
             {
                 if (query.SourceType > 0)
@@ -38,12 +40,6 @@ WHERE 1=1
                     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 + "%");
-                }
-            
                 if (query.CountryIdList != null && query.CountryIdList.Count > 0)
                 {
                     var countryList = query.CountryIdList
@@ -56,7 +52,7 @@ WHERE 1=1
                     }
                 }
             }
-            builder.AppendFormat(" LIMIT 100; ");
+            builder.AppendFormat(" ORDER BY score DESC LIMIT 50; ");
             return Get<RB_Spider_Poi_Extend>(builder.ToString(), parameters).ToList();
         }
     }