Pu Zhibing
4 天以前 388d1eb5f87c50ede6b415950899fe8bb938ee28
修改bug
6个文件已修改
49 ■■■■ 已修改文件
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/resources/application-dev.yml 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
UserQYTTravel/guns-admin/src/main/resources/application-test.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java
@@ -29,6 +29,7 @@
import com.stylefeng.guns.modular.taxi.dao.OrderTaxiMapper;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import io.rong.models.response.TokenResult;
import org.apache.shiro.authc.SimpleAuthenticationInfo;
import org.apache.shiro.authc.UsernamePasswordToken;
import org.apache.shiro.authc.credential.HashedCredentialsMatcher;
@@ -562,8 +563,8 @@
        loginWarpper.setToken(token);
        loginWarpper.setAppid(UUIDUtil.getRandomCode());
        loginWarpper.setState(ToolUtil.isEmpty(driver.getIdCard()) ? 1 : 0);
//        TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
//        loginWarpper.setRongYunToken(token1.getToken());
        TokenResult token1 = RongCloudUtil.getToken(driver.getId().toString(), driver.getName(), driver.getHeadImgUrl());
        loginWarpper.setRongYunToken(token1.getToken());
        //创建高德猎鹰的终端数据
//        String tid = gdFalconUtil.createTerminal(phone);
DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -91,7 +91,7 @@
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
            this.setBucketName("bucuTest0625");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setEndPoint("http://10.30.52.45:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
@@ -105,7 +105,7 @@
            this.setApiUrl("http://jjzhongtai.stqcloud.com:10010");
            this.setBucketName("qyt20250702");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setEndPoint("http://10.30.52.45:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -703,6 +703,15 @@
                            orderPrivateCar.setIsDelete(1);
                            orderPrivateCar.setPid(orderPrivateCar1.getPid() == null ? orderPrivateCar1.getId() : orderPrivateCar1.getPid());
                            Integer promotion1 = isPromotion(orderPrivateCar.getUserId());
                            if(promotion1!=null){
                                orderPrivateCar.setPromotion(2);
                                Driver driver1 = driverService.selectById(promotion);
                                orderPrivateCar.setPromotionUser(driver1.getName());
                                orderPrivateCar.setPromotionPhone(driver1.getPhone());
                                orderPrivateCar.setPromotionDriverId(promotion1);
                            }
                            Company company = companyService.selectById(driver.getCompanyId());
                            //调三方订单中心创建行程单
                            CreateTravelItineraryRequest request = new CreateTravelItineraryRequest();
@@ -717,15 +726,6 @@
                            request.setServiceType(2);
                            String travelItinerary = OrderUtil.createTravelItinerary(request);
                            orderPrivateCar.setTravelId(travelItinerary);
                            Integer promotion1 = isPromotion(orderPrivateCar.getUserId());
                            if(promotion1!=null){
                                orderPrivateCar.setPromotion(2);
                                Driver driver1 = driverService.selectById(promotion);
                                orderPrivateCar.setPromotionUser(driver1.getName());
                                orderPrivateCar.setPromotionPhone(driver1.getPhone());
                                orderPrivateCar.setPromotionDriverId(promotion1);
                            }
                            this.insertOrUpdate(orderPrivateCar);
                            //修改总订单人数
UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/QianYunTongConfig.java
@@ -179,7 +179,7 @@
            this.setApiUrl("https://test-zhongtai.stqcloud.com:10070");
            this.setBucketName("bucuTest0625");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setEndPoint("http://10.30.52.45:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
@@ -192,7 +192,7 @@
            this.setApiUrl("http://jjzhongtai.stqcloud.com:10010");
            this.setBucketName("qyt20250702");
            this.setAppId("wxcc3c9058e2b294db");
            this.setEndPoint("http://119.4.112.68:27741/v1");
            this.setEndPoint("http://10.30.52.45:27741/v1");
            this.setAccount("d8bef0a04db511f0b79d01a3e2b7587e");
            this.setAccessKey("TYMFTFD5SIIT15DCCUD7");
            this.setSecretKey("AoI1dkH3yoAvXoaQlREO3ed9mwQJFluLTliS9T1z");
UserQYTTravel/guns-admin/src/main/resources/application-dev.yml
@@ -124,10 +124,10 @@
#邮件配置
spring:
  mail:
    host: smtp.qq.com
    port: 465
    username: 1721849008@qq.com
    password: nhnbmjfdywilcbdj  # 这里是授权码,不是邮箱登录密码
    host: smtp.163.com
    port: 993
    username: QYTJT001@163.com
    password: GPaYdKdsQphDGRJd  # 这里是授权码,不是邮箱登录密码
    properties:
      mail:
        smtp:
@@ -137,4 +137,4 @@
# pdf生成位置
trip:
  sheet:
    filePath: D:/qytPdf/
    filePath: /etraffic/server/qytPdf/
UserQYTTravel/guns-admin/src/main/resources/application-test.yml
@@ -122,10 +122,10 @@
#邮件配置
spring:
  mail:
    host: smtp.qq.com
    port: 465
    username: 1721849008@qq.com
    password: nhnbmjfdywilcbdj  # 这里是授权码,不是邮箱登录密码
    host: smtp.163.com
    port: 993
    username: QYTJT001@163.com
    password: GPaYdKdsQphDGRJd  # 这里是授权码,不是邮箱登录密码
    properties:
      mail:
        smtp: