新增加功能

Pu Zhibing

2025-04-16 9a97d594f4a7373022eac34c93f9adb511c6af16

新增加功能

 DriverOKTravel/guns-admin/doc/Guns 技术文档 v1.0.pdf

Binary files differ

 DriverOKTravel/guns-admin/sql/guns.sql

File was deleted

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -48,7 +48,7 @@
    private Integer historyNum;
    @ApiModelProperty("订单总金额")
    private Double orderMoney;
    @ApiModelProperty("支付方式（1=OK平台支付（线上支付），2=其他方式支付（线下支付））")
    @ApiModelProperty("支付方式（1=线上计费，2=打表计费）")
    private Integer payManner;
    @ApiModelProperty("支付金额")
    private Double payMoney;

 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/dao/mapping/OrderTaxiMapper.xml

@@ -261,7 +261,8 @@
        orderSource as orderSource,
        orderType as orderType,
        oldPeople as oldPeople,
        companyId as companyId
        companyId as companyId,
        payManner
        from t_order_taxi where id = #{orderId}
    </select>


 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/taxi/service/impl/OrderTaxiServiceImpl.java

@@ -480,31 +480,6 @@
                    orderTaxi.setState(6);
                }
                orderTaxi.setEndServiceTime(new Date());

//                List<TUseMoney> money = useMoneyMapper.selectList(null);
//                Driver driver = driverService.selectById(orderTaxi.getDriverId());
//                Company company = companyService.selectById(driver.getCompanyId());
//                TransactionDetails transactionDetails = new TransactionDetails();
//                if(orderTaxi.getOrderSource() == 2 || orderTaxi.getOrderSource() == 3){
//                    double v = company.getPercentageDeduction() / 100;
//                    v = v * orderTaxi.getOrderMoney();
//                    driver.setBalance(driver.getBalance() - v);
//                    transactionDetails.setMoney(v);
//                }else {
//                    driver.setBalance(driver.getBalance() - company.getFixedDeduction());
//                    transactionDetails.setMoney(company.getFixedDeduction());
//                }
//                // 新增扣除使用费记录
//                transactionDetails.setUserId(driver.getId());
//                transactionDetails.setInsertTime(new Date());
//                transactionDetails.setRemark("软件使用费");
//                transactionDetails.setState(2);
//                transactionDetails.setType(1);
//                transactionDetails.setUserType(2);
//                transactionDetails.setOrderType(6);
//                transactionDetails.setOrderId(orderTaxi.getId());
//                transactionDetailsMapper.insert(transactionDetails);
//                driverService.updateById(driver);
                pushUtil.removeTask(orderId, 2);//删除定时任务，结束推送数据
                systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderTaxi.getUserId());
                break;

 DriverOKTravel/guns-rest/db/guns_rest.sql

File was deleted