修改bug

puzhibing

2022-09-13 67c773ad69dedfaea292d9da6257c5087d6e1754

修改bug

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/PhoneController.java

@@ -36,7 +36,7 @@
    @ApiOperation(value = "获取首页电话【1.0】", tags = {"用户端-首页", "用户端-包车"}, notes = "type=1(报警电话)，type=2(投诉电话)，type=3(包车调度电话)")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "定位经度", name = "lat", required = true, dataType = "double"),
            @ApiImplicitParam(value = "定位维度", name = "code", required = true, dataType = "double")
            @ApiImplicitParam(value = "定位维度", name = "lnt", required = true, dataType = "double")
    })
    public ResultUtil queryPhones(Double lat, Double lnt){
        try {
@@ -58,7 +58,7 @@
    @ApiOperation(value = "获取个人中心的客服电话【1.0】", tags = {"用户端-个人中心"}, notes = "platform(平台电话)，company(本地电话)")
    @ApiImplicitParams({
            @ApiImplicitParam(value = "定位经度", name = "lat", required = true, dataType = "double"),
            @ApiImplicitParam(value = "定位维度", name = "code", required = true, dataType = "double"),
            @ApiImplicitParam(value = "定位维度", name = "lnt", required = true, dataType = "double"),
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil queryCustomerPhone(Double lat, Double lnt){

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml

@@ -23,7 +23,7 @@
        from t_phone where companyId in (
        select companyId from t_company_city where state = 1
        <if test="null != city">
            and cityId in (
            and cityId in (select id from t_city where englishName in
            <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
                #{item}
            </foreach>
@@ -51,7 +51,7 @@
            and companyId in (
            select companyId from t_company_city where state = 1
            <if test="null != city">
                and cityId in (
                and cityId in (select id from t_city where englishName in
                <foreach collection="city" item="item" index="index" separator="," open="(" close=")">
                    #{item}
                </foreach>

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

@@ -41,13 +41,13 @@
     */
    @Override
    public List<BaseWarpper> queryOpenCity(Integer uid, Integer language) throws Exception {
        if(null == language){
            language = 2;
        }
        if(null != uid){
            UserInfo userInfo = userInfoService.selectById(uid);
            language = userInfo.getLanguage();
        }
        if(null == language){
            language = 2;
        }
        List<OpenCity> openCities = openCityMapper.queryOpenCity();
        List<BaseWarpper> list = new ArrayList<>();
        for(OpenCity c : openCities){

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java

@@ -62,8 +62,10 @@
            AddressComponent[] addressComponents = results[0].addressComponents;
            AddressComponentsVo[] addressComponentsVos = new AddressComponentsVo[addressComponents.length];
            for (int i = 0; i < addressComponents.length; i++) {
                addressComponentsVos[i].setLongName(addressComponents[i].longName);
                addressComponentsVos[i].setShortName(addressComponents[i].shortName);
                AddressComponentsVo addressComponentsVos1 = new AddressComponentsVo();
                addressComponentsVos1.setLongName(addressComponents[i].longName);
                addressComponentsVos1.setShortName(addressComponents[i].shortName);
                addressComponentsVos[i] = addressComponentsVos1;
            }
            String address = results[0].formattedAddress;
            vo.setAddressComponentsVos(addressComponentsVos);

 UserIGOTravel/guns-admin/src/main/resources/application.yml

@@ -49,26 +49,26 @@
  base-package: com.stylefeng.guns.modular


#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: HjKbXilb9zajmXbl
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat


################# 测试环境 ###################
spring:
  profiles: local
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: 123456
    password: HjKbXilb9zajmXbl
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


################# 测试环境 ###################
#spring:
#  profiles: local
#  datasource:
#    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat

#多数据源情况的配置
guns:
  muti-datasource: