blame | history | patch | commit | commitdiff | ignore whitespace
彭雪彬
2025-07-15 a7501803a3ca43310e57a5dd912e5047919c2e43 
 oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreQueryServiceImpl.java


@@ -1,10 +1,9 @@


package com.oying.modules.pc.store.service.impl;




import cn.hutool.core.collection.CollectionUtil;


import cn.hutool.core.collection.ListUtil;


import cn.hutool.core.util.NumberUtil;


import com.oying.modules.pc.store.domain.Store;


import com.oying.modules.pc.store.domain.dto.StoreQueryCriteria;


import com.oying.modules.pc.store.mapper.StoreMapper;


import com.oying.modules.pc.store.service.StoreQueryService;


import com.oying.modules.pc.store.service.StoreService;


import com.oying.utils.PageResult;


@@ -27,7 +26,6 @@




    private final RedisTemplate<Object, Object> redisTemplate;


    private final StoreService storeService;


    private final StoreMapper storeMapper;




    @Override


    public PageResult<Store> findPagedStores(StoreQueryCriteria criteria) {


@@ -39,7 +37,7 @@


        Long total = redisTemplate.opsForZSet().size(setKey);


        if (total == null || total == 0) {


            // 初始化缓存


            List<Long> ids = storeMapper.queryStoreIds(criteria);


            List<Long> ids = storeService.queryStoreIds(criteria);


            int index = 0;


            for (Long id : ids) {


                redisTemplate.opsForZSet().add(setKey, id, index++);


@@ -56,17 +54,32 @@


        Set<Long> storeIds = Optional.ofNullable(redisTemplate.opsForZSet().range(setKey, offset, end))


                .orElse(Collections.emptySet())


                .stream()


                .map(i-> (Long) i)


                .map(i -> (Long) i)


                .collect(Collectors.toSet());




        // 3. 获取详情数据]


        List<Store> stores = Optional.of(storeIds)


                .filter(CollectionUtil::isNotEmpty)


                .map(storeService::listByIds)


                .map(storeService::getStoresByIds)


                .orElse(ListUtil.toList());




        stores.forEach(u -> u.setDeliveryDuration(distanceCalculation(criteria.getLatitude(), criteria.getLongitude(), u.getLatitude(), u.getLongitude())));




        page.setContent(stores);


        page.setTotalElements(total);


        return page;


    }




    private Integer distanceCalculation(double lat1, double lon1, double lat2, double lon2) {


        // 地球半径（千米）


        final int R = 6371;


        // 将纬度、经度从度转换为弧度


        double latDistance = Math.toRadians(lat2 - lat1);


        double lonDistance = Math.toRadians(lon2 - lon1);


        double a = Math.sin(latDistance / 2) * Math.sin(latDistance / 2)


                + Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2))


                * Math.sin(lonDistance / 2) * Math.sin(lonDistance / 2);


        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));


        return new Double(R * c * 1000).intValue();


    }


}