Merge remote-tracking branch 'origin/master'

liujie

2023-08-08 5592de9cf80aa78486775a72a6224973c93146da

 cloud-server-other/src/main/java/com/dsh/other/controller/StoreController.java

@@ -45,8 +45,11 @@

    @PostMapping("/base/protocol/storeDetail/nearbyStore")
    public List<StoreInfo> getAllNearbyStoreList(@RequestBody GetAllNearbyStoreList list ){
        String current = list.getLongitude()+","+list.getLatitude();
        List<StoreInfo> storeInfos = new ArrayList<>();
        if (ToolUtil.isEmpty(list.getLongitude()) && ToolUtil.isEmpty(list.getLatitude())){
            return storeInfos;
        }
        String current = list.getLongitude()+","+list.getLatitude();
        String cityCode = "";
        try {
            Map<String, String> geocode = gdMapGeocodingUtil.geocode(list.getLongitude(), list.getLatitude());
@@ -63,11 +66,17 @@
                String storeLat = store.getLat();
                String result = storeLon+","+storeLat;
                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
                long l = 0;
                try {
                    l = Long.parseLong(distanceTOKilometer);
                }catch (Exception e){
                    l = 0;
                }
                StoreInfo info = new StoreInfo();
                info.setStoreId(store.getId());
                info.setStoreName(store.getName());
                info.setStoreImg(store.getRealPicture());
                info.setDistance(Long.parseLong(distanceTOKilometer));
                info.setDistance(l);
                info.setStoreAddr(store.getAddress());
                info.setLatitude(storeLat);
                info.setLongitude(storeLon);
@@ -105,12 +114,16 @@
                .eq("state",1 )
                .eq("cityCode",citycodeResp.getCityCode()));
        if (list.size() > 0 ){
            if (ToolUtil.isEmpty(citycodeResp.getLongitude()) && ToolUtil.isEmpty(citycodeResp.getLatitude())){
                return detailLists;
            }
            for (Store store : list) {
                String current = citycodeResp.getLongitude() +","+citycodeResp.getLatitude();
                String result = store.getLon()+","+store.getLat();
                String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
                long l = Long.parseLong(distanceTOKilometer);
                if (ToolUtil.isNotEmpty(citycodeResp.getSpace()) && l > citycodeResp.getSpace()){
//                取5公里范围内的门店
                if ( l > 5){
                    continue;
                }
                StoreDetailList detailList = new StoreDetailList();