DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java
@@ -493,8 +493,7 @@ @Override public ResultUtil confirmFees(Integer orderId, Integer type, Double travelFee, Double parkingFee, Double crossingFee) throws Exception { OrderTaxi orderTaxi = this.selectById(orderId); orderTaxi.setPayManner(type); if(orderTaxi.getPayManner()==3){ if(2 == type && orderTaxi.getPayManner()==3){ orderTaxi.setState(9); Driver driver = driverService.selectById(orderTaxi.getDriverId()); @@ -518,7 +517,7 @@ driverService.updateById(driver); } //打表计费，直接订单完成支付， if(orderTaxi.getPayManner()==2){ if(2 == type && orderTaxi.getPayManner()==2){ orderTaxi = this.setMoney2(orderTaxi, parkingFee, crossingFee); //在线上计费的基础上随机加0.01-1的金额 Double orderMoney = orderTaxi.getOrderMoney() + (new BigDecimal(Math.random()).setScale(2, BigDecimal.ROUND_DOWN).doubleValue()); @@ -555,7 +554,7 @@ driverService.updateById(driver); } //线上计费，计算费用后修改为待支付 if(orderTaxi.getPayManner()==1){ if(1 == type && orderTaxi.getPayManner()==1){ orderTaxi = this.setMoney2(orderTaxi, crossingFee, crossingFee); orderTaxi.setState(7); } DriverOKTravel/guns-admin/src/main/resources/application.yml
@@ -51,12 +51,9 @@ spring: datasource: url: jdbc:mysql://127.0.0.1:3306/xianning_1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true url: jdbc:mysql://127.0.0.1:10633/xianning?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true username: root password: 123456 # url: jdbc:mysql://127.0.0.1:3306/jk_fitness?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true # username: root # password: root password: XianNing@2024! db-name: guns #用来搜集数据库的所有表 filters: wall,mergeStat
