|
@@ -20,17 +20,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
import org.springframework.web.client.RestTemplate;
|
|
import org.springframework.web.client.RestTemplate;
|
|
|
import shop.alien.entity.result.R;
|
|
import shop.alien.entity.result.R;
|
|
|
-import shop.alien.entity.store.LifeBlacklist;
|
|
|
|
|
-import shop.alien.entity.store.StoreImg;
|
|
|
|
|
-import shop.alien.entity.store.StoreUser;
|
|
|
|
|
|
|
+import shop.alien.entity.store.*;
|
|
|
|
|
+import shop.alien.entity.store.vo.StoreBannerVo;
|
|
|
import shop.alien.entity.store.vo.StoreInfoVo;
|
|
import shop.alien.entity.store.vo.StoreInfoVo;
|
|
|
-import shop.alien.entity.store.CommonRating;
|
|
|
|
|
import shop.alien.mapper.CommonRatingMapper;
|
|
import shop.alien.mapper.CommonRatingMapper;
|
|
|
import shop.alien.mapper.LifeBlacklistMapper;
|
|
import shop.alien.mapper.LifeBlacklistMapper;
|
|
|
import shop.alien.mapper.StoreImgMapper;
|
|
import shop.alien.mapper.StoreImgMapper;
|
|
|
import shop.alien.mapper.StoreUserMapper;
|
|
import shop.alien.mapper.StoreUserMapper;
|
|
|
import shop.alien.store.annotation.TrackEvent;
|
|
import shop.alien.store.annotation.TrackEvent;
|
|
|
import shop.alien.store.service.CommonRatingService;
|
|
import shop.alien.store.service.CommonRatingService;
|
|
|
|
|
+import shop.alien.store.service.StoreBannerService;
|
|
|
import shop.alien.store.service.StoreImgService;
|
|
import shop.alien.store.service.StoreImgService;
|
|
|
import shop.alien.store.service.StoreInfoService;
|
|
import shop.alien.store.service.StoreInfoService;
|
|
|
import shop.alien.entity.store.vo.StoreBusinessStatusVo;
|
|
import shop.alien.entity.store.vo.StoreBusinessStatusVo;
|
|
@@ -65,6 +64,7 @@ public class AiSearchController {
|
|
|
|
|
|
|
|
private final RestTemplate restTemplate;
|
|
private final RestTemplate restTemplate;
|
|
|
private final StoreImgService storeImgService;
|
|
private final StoreImgService storeImgService;
|
|
|
|
|
+ private final StoreBannerService storeBannerService;
|
|
|
private final CommonRatingService commonRatingService;
|
|
private final CommonRatingService commonRatingService;
|
|
|
private final CommonRatingMapper commonRatingMapper;
|
|
private final CommonRatingMapper commonRatingMapper;
|
|
|
private final StoreInfoService storeInfoService;
|
|
private final StoreInfoService storeInfoService;
|
|
@@ -124,6 +124,14 @@ public class AiSearchController {
|
|
|
// relatedResults.addAll(relatedResult);
|
|
// relatedResults.addAll(relatedResult);
|
|
|
jsonObject1.put("matchedRecords", matchedResult);
|
|
jsonObject1.put("matchedRecords", matchedResult);
|
|
|
jsonObject1.put("relatedRecords", relatedResult);
|
|
jsonObject1.put("relatedRecords", relatedResult);
|
|
|
|
|
+ // 根据matchedResult中的business_section_name去插入到storeBanners中
|
|
|
|
|
+ List<String> sectionNames = matchedResult.stream()
|
|
|
|
|
+ .map(StoreInfoVo::getBusinessSectionName)
|
|
|
|
|
+ .filter(StringUtils::isNotBlank)
|
|
|
|
|
+ .distinct()
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+ List<StoreBannerVo> storeBanners = storeBannerService.getBannerByAISearch(sectionNames);
|
|
|
|
|
+ jsonObject1.put("storeBanners", storeBanners);
|
|
|
|
|
|
|
|
|
|
|
|
|
jsonObject1.put("total", jsonObject.get("total"));
|
|
jsonObject1.put("total", jsonObject.get("total"));
|