Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-01 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc

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

@@ -1,6 +1,7 @@
package com.dsh.other.controller;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Store;
import com.dsh.other.feignclient.model.*;
@@ -89,12 +90,11 @@
     * @return
     */
    @PostMapping("/base/protocol/storeDetail/distanceCal")
    public long calculateDistance(@RequestBody GetDistanceVo distanceVo){
    public String calculateDistance(@RequestBody GetDistanceVo distanceVo){
        String current = distanceVo.getLongitude()+","+distanceVo.getLatitude();
        Store store = storeService.getById(distanceVo.getStoreId());
        String result = store.getLon()+","+store.getLat();
        String distanceTOKilometer = gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
        return Long.parseLong(distanceTOKilometer);
        return gdMapGeocodingUtil.getDistanceTOKilometer(current, result);
    }


@@ -149,6 +149,22 @@
    }


    /**
     * 获取门店列表
     * @return
     */
    @ResponseBody
    @PostMapping("/store/queryStoreByIds")
    public List<Store> queryStoreByIds(List<Integer> ids){
        try {
            return storeService.list(new LambdaQueryWrapper<Store>()
                    .in(Store::getId,ids));
        }catch (Exception e){
            e.printStackTrace();
            return new ArrayList<>();
        }
    }