修改bug

Pu Zhibing

7 天以前 8d9c26c91eff811b8c4193e31f7b9e3e4dd56812

修改bug

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/OrderUtil.java

@@ -183,7 +183,7 @@
     * @return
     */
    public static PayInfo tradePayOff1(TradePayOff1Data tradePayOff1Data) {
        tradePayOff1Data.setPartnerId("5400004");
        tradePayOff1Data.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        tradePayOff1Data.setTimeout("72H");
        tradePayOff1Data.setScene("TRAFFIC");
        tradePayOff1Data.setCurrency("RMB");
@@ -200,7 +200,7 @@
        
        
        TradeRequest request = new TradeRequest<TradePayOff1Data>();
        request.setSceneId("1911676727023968256");
        request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954795404533583872" : "1911676727023968256");
        request.setAppId(qianYunTongConfig.getAppkey());
        request.setConfigVersion(1);
        request.setRequestId(UUIDUtil.getRandomCode());
@@ -391,7 +391,7 @@
        tradeOrderCreateData.setTimeout("72H");
        tradeOrderCreateData.setOrderAppId("52270015");
        tradeOrderCreateData.setChannelSource("GRJYCXWXXCX");
        tradeOrderCreateData.setPayPartnerId("5400004");
        tradeOrderCreateData.setPayPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401007" : "5400004");
        tradeOrderCreateData.setCurrency("RMB");
        tradeOrderCreateData.setNeedLoginFlag("N");
        tradeOrderCreateData.setAccessMode("APP");
@@ -405,7 +405,7 @@
        
        
        TradeRequest request = new TradeRequest<TradeOrderCreateData>();
        request.setSceneId("1945688132719169536");
        request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954793280550756352" : "1945688132719169536");
        request.setAppId(qianYunTongConfig.getAppkey());
        request.setConfigVersion(1);
        request.setRequestId(UUIDUtil.getRandomCode());
@@ -457,7 +457,7 @@
        createOrderRequest.setChannelSource("GRJYCXWXXCX");
        
        TradeRequest request = new TradeRequest<CreateOrderRequest>();
        request.setSceneId("1948289607125864448");
        request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954792737421942784" : "1948289607125864448");
        request.setAppId(qianYunTongConfig.getAppkey());
        request.setConfigVersion(1);
        request.setRequestId(UUIDUtil.getRandomCode());
@@ -503,7 +503,7 @@
     * @return
     */
    public static PayInfo tradePayOff(TradePayOffData tradePayOffData) {
        tradePayOffData.setPartnerId("5400005");
        tradePayOffData.setPartnerId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "5401008" : "5400005");
        tradePayOffData.setTimeout("72H");
        tradePayOffData.setScene("TRAFFIC");
        tradePayOffData.setCurrency("RMB");
@@ -539,9 +539,9 @@
        
        
        TradeRequest request = new TradeRequest<TradePayOffData>();
        request.setSceneId("1774717104844095488");
        request.setSceneId("prod".equals(qianYunTongConfig.getActiveProfile()) ? "1954794605782913024" : "1774717104844095488");
        request.setAppId(qianYunTongConfig.getAppkey());
        request.setConfigVersion(2);
        request.setConfigVersion("prod".equals(qianYunTongConfig.getActiveProfile()) ? 1 : 2);
        request.setRequestId(UUIDUtil.getRandomCode());
        request.setData(tradePayOffData);
        //请求路径

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/ZhengLianConfig.java

@@ -74,13 +74,13 @@
        }
        if("prod".equals(activeProfile)){
            this.url = "https://gateway.zqpay.com";
            this.appid = "";
            this.merchNo = "";
            this.encrpNo = "";
            this.signNo = "";
            this.cer = "";
            this.sm2 = "";
            this.password = "";
            this.appid = "3e06da1751ec1626b30f7703a088f298";
            this.merchNo = "B00000402";
            this.encrpNo = "1342935640";
            this.signNo = "1471742568";
            this.cer = "/etraffic/server/1342935640.cer";
            this.sm2 = "/etraffic/server/1342935640.sm2";
            this.password = "31028Mky";
        }
        return this;
    }

 DriverQYTTravel/guns-admin/src/main/resources/application-prod.yml

@@ -29,13 +29,13 @@
                max-request-size: 100MB
                max-file-size: 100MB
    redis:
        host: 172.21.35.151
        port: 6512
        password: SC_cache@20#25
        host: 10.31.1.219
        port: 6410
        password: Qnz_jt@20#25
        database: 0
        timeout: 1000
        cluster:
            nodes: 172.21.35.151:6512,172.21.35.152:6512,172.21.35.153:6512,172.21.35.151:6513,172.21.35.152:6513,172.21.35.153:6513
            nodes: 10.31.1.219:6410,10.31.1.30:6410,10.31.1.97:6411

mybatis-plus:
    typeAliasesPackage: com.stylefeng.guns.modular
@@ -58,9 +58,9 @@

spring:
    datasource:
        url: jdbc:mysql://172.21.35.140:8066/traffic_scdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
        username: traffic_scusr
        password: QYT_sc@20#25
        url: jdbc:mysql://10.31.9.146:8066/qnjt_ridingdb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
        username: qnjt_ridingusr
        password: qnjtriding@Prom2025
        db-name: traffic_scdb #用来搜集数据库的所有表
        filters: wall,mergeStat

@@ -68,7 +68,11 @@
spring:
    data:
        mongodb:
            uri: mongodb://qyt_jtcx:qyt_jtcx2025@172.21.35.195:27017,172.21.35.196:27017/traveling_track
            host: 10.31.204.66
            port: 27009
            username: qnjt_ridingmgdb
            password: qnjtriding@Prom2025
            database: qnjt_ridingmgdb

---

@@ -105,13 +109,13 @@
    masterSecret-dispatch: 111 #用于服务器端 API 调用时与 AppKey 配合使用达到鉴权的目的

qyt:
    socket_uri:
    socket_uri: http://10.31.182.13:6000

---

#支付回调地址
#正式环境
callbackPath: https://traffic.qytzt.cn/driver
callbackPath: https://traffic.qytzt.cn/chuxing/driver

---
#交通部推送数据功能开关