|
@@ -345,10 +345,17 @@ public class AppHomeServiceImpl implements IAppHomeService {
|
|
|
Page<SearchVO.SearchRaceVO> searchCompetitionVOPage = appGameMapper.convertSearchCompetitionVOPage(page, searchDTO);
|
|
|
searchCompetitionVOPage.getRecords().forEach(competitionVO -> {
|
|
|
AppSite appSite = appSiteMapper.selectOne(
|
|
|
- Wrappers.<AppSite>lambdaQuery().eq(AppSite::getOrgCode, competitionVO.getOrgCode()));
|
|
|
- competitionVO.setKm(PositionUtil.calculateDistance(
|
|
|
- searchDTO.getLatitude(), searchDTO.getLongitude(),
|
|
|
- appSite.getLatitude().doubleValue(), appSite.getLongitude().doubleValue()));
|
|
|
+ Wrappers.<AppSite>lambdaQuery().eq(AppSite::getId, competitionVO.getSiteId()));
|
|
|
+ if(null != appSite){
|
|
|
+ competitionVO.setKm(PositionUtil.calculateDistance(
|
|
|
+ searchDTO.getLatitude(), searchDTO.getLongitude(),
|
|
|
+ appSite.getLatitude().doubleValue(), appSite.getLongitude().doubleValue()));
|
|
|
+ if(competitionVO.getSiteType() == 1){
|
|
|
+ competitionVO.setKm(PositionUtil.calculateDistance(
|
|
|
+ searchDTO.getLatitude(), searchDTO.getLongitude(),
|
|
|
+ competitionVO.getLatitude().doubleValue(), competitionVO.getLongitude().doubleValue()));
|
|
|
+ }
|
|
|
+ }
|
|
|
// 获取价格规则并判断 type
|
|
|
List<AppGamePriceRules> appGamePriceRules = appGamePriceRulesMapper.selectList(
|
|
|
Wrappers.<AppGamePriceRules>lambdaQuery()
|