Merge remote-tracking branch 'origin/master'

mitao

2025-11-24 23250d578c7da233b5f4fb2998dbb9a4f094e4d7

Merge remote-tracking branch 'origin/master'

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

@@ -93,7 +93,7 @@
#    db-name: jyxtravel #用来搜集数据库的所有表
#    filters: wall,mergeStat
  datasource:
    url: jdbc:mysql://127.0.0.1:3307/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    url: jdbc:mysql://192.168.110.188:3307/jyxtravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root_remote
    password: 123456
    db-name: jyxtravel #用来搜集数据库的所有表

 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/huifu/biz/DouGongBasicDataBiz.java

@@ -256,7 +256,7 @@
        // 请求流水号
        paramsInfo.put("req_seq_id", "rQ20251119164316677154");
        // 请求日期
        paramsInfo.put("req_date", "20251121");
        paramsInfo.put("req_date", "20251123");
        // 出款方商户号
        paramsInfo.put("out_huifu_id", "6666000182995771");
        // 支付金额

 UserJYXTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -283,7 +283,7 @@
        a.headImgUrl as avatar,
        a.phone as phone,
        c.carLicensePlate as carCode,
        CONCAT(F.`name`, d.`name`,  '.', c.carColor) as carName,
        CONCAT(f.`name`, d.`name`,  '.', c.carColor) as carName,
        (select sum(fraction) / count(id) from t_order_evaluate where driverId = a.id) as score,
        (
        (select count(id) from t_order_private_car where state in (7, 8, 9) and driverId = a.id) +