Merge remote-tracking branch 'origin/dev' into dev

luo

2024-01-30 cf487b4baf05048e8929b47d73efc83d6a09162c

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityBusinessServiceImpl.java

@@ -4,6 +4,9 @@
import com.stylefeng.guns.modular.system.dao.OpenCityBusinessMapper;
import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
import com.stylefeng.guns.modular.system.service.IOpenCityBusinessService;
import com.stylefeng.guns.modular.system.util.GoogleMap.AddressComponentsVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import org.springframework.stereotype.Service;

@@ -21,49 +24,52 @@

    /**
     * 获取业务类型
     * @param province  省名
     * @param city      市名称
     * @param district  区县名称
     * @return
     * @throws Exception
     */
    @Override
    public List<BaseWarpper> queryBusiness(String province, String city, String district) throws Exception {
        List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusiness(province, city, district);
        if(openCityBusinesses.size() == 0){
            openCityBusinesses = openCityBusinessMapper.queryBusiness(province, city, null);
    public List<BaseWarpper> queryBusiness(Double lat, Double lnt, Integer language) throws Exception {
        if(null == language){
            language = 2;
        }
        if(openCityBusinesses.size() == 0){
            openCityBusinesses = openCityBusinessMapper.queryBusiness(province, null, null);
        ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lnt);
        if(null == reverseGeocode){
            return new ArrayList<>();
        }
        AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
        String[] city = new String[addressComponentsVos.length];
        for (int i = 0; i < addressComponentsVos.length; i++) {
            city[i] = addressComponentsVos[i].getLongName();
        }
        List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusiness(city);
        List<BaseWarpper> list = new ArrayList<>();
        for(OpenCityBusiness b : openCityBusinesses){
            BaseWarpper baseWarpper = new BaseWarpper();
            switch (b.getBusinessType()){
                case 1:
                    baseWarpper.setName("专车");
                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
                    baseWarpper.setId(1);
                    break;
                case 2:
                    baseWarpper.setName("出租车");
                    baseWarpper.setId(2);
                    break;
                case 3:
                    baseWarpper.setName("跨城出行");
                    baseWarpper.setId(3);
                    break;
//                case 2:
//                    baseWarpper.setName(language == 1 ? "出租车" : language == 2 ? "" : "");
//                    baseWarpper.setId(2);
//                    break;
//                case 3:
//                    baseWarpper.setName(language == 1 ? "跨城出行" : language == 2 ? "" : "");
//                    baseWarpper.setId(3);
//                    break;
                case 4:
                    baseWarpper.setName("同城小件物流");
                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
                    baseWarpper.setId(4);
                    break;
                case 5:
                    baseWarpper.setName("跨城小件物流");
                    baseWarpper.setId(5);
                    break;
                case 6:
                    baseWarpper.setName("包车");
                    baseWarpper.setId(6);
                    break;
//                case 5:
//                    baseWarpper.setName(language == 1 ? "跨城小件物流" : language == 2 ? "" : "");
//                    baseWarpper.setId(5);
//                    break;
//                case 6:
//                    baseWarpper.setName(language == 1 ? "包车" : language == 2 ? "" : "");
//                    baseWarpper.setId(6);
//                    break;
            }
            list.add(baseWarpper);
        }
@@ -78,36 +84,39 @@
     * @throws Exception
     */
    @Override
    public List<BaseWarpper> queryBusinessById(Integer id) throws Exception {
    public List<BaseWarpper> queryBusinessById(Integer id, Integer language) throws Exception {
        if(null == language){
            language = 2;
        }
        List<OpenCityBusiness> openCityBusinesses = openCityBusinessMapper.queryBusinessById(id);
        List<BaseWarpper> list = new ArrayList<>();
        for(OpenCityBusiness b : openCityBusinesses){
            BaseWarpper baseWarpper = new BaseWarpper();
            switch (b.getBusinessType()){
                case 1:
                    baseWarpper.setName("专车");
                    baseWarpper.setName(language == 1 ? "打车" : language == 2 ? "Ride" : "Course");
                    baseWarpper.setId(1);
                    break;
                case 2:
                    baseWarpper.setName("出租车");
                    baseWarpper.setId(2);
                    break;
                case 3:
                    baseWarpper.setName("跨城出行");
                    baseWarpper.setId(3);
                    break;
//                case 2:
//                    baseWarpper.setName("出租车");
//                    baseWarpper.setId(2);
//                    break;
//                case 3:
//                    baseWarpper.setName("跨城出行");
//                    baseWarpper.setId(3);
//                    break;
                case 4:
                    baseWarpper.setName("同城小件物流");
                    baseWarpper.setName(language == 1 ? "包裹" : language == 2 ? "Package" : "Livraison");
                    baseWarpper.setId(4);
                    break;
                case 5:
                    baseWarpper.setName("跨城小件物流");
                    baseWarpper.setId(5);
                    break;
                case 6:
                    baseWarpper.setName("包车");
                    baseWarpper.setId(6);
                    break;
//                case 5:
//                    baseWarpper.setName("跨城小件物流");
//                    baseWarpper.setId(5);
//                    break;
//                case 6:
//                    baseWarpper.setName("包车");
//                    baseWarpper.setId(6);
//                    break;
            }
            list.add(baseWarpper);
        }