igo出行
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
luo
2024-02-19 dffcec437fd95727867192bef825617f65d027ce 
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java


@@ -181,8 +181,8 @@


            d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));


            c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);


        }


        incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());


        incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());


//        incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());


//        incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), orderLogistics.getType(), c.doubleValue());


        driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());


        driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());


        driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());


@@ -312,6 +312,7 @@


                        d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));


                        c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);


                    }




                    incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), 4, d.doubleValue());


                    incomeService.saveData(2, orderLogistics.getDriverId(), 2, orderLogistics.getId(), 4, c.doubleValue());


                    Driver driver = driverService.selectById(orderLogistics.getDriverId());


@@ -322,9 +323,6 @@


                }




                if (orderLogistics.getPayType()==4||!orderLogisticsId.isEmpty()){




                    System.err.println("1111111111111111111111111");




                    double sum = 0;


                    if (orderLogistics.getPayType()==4){


                        sum= orderLogistics.getOrderMoney();


@@ -353,7 +351,6 @@


                    }


                    //记录司机待结算金额


                    if(d.compareTo(new BigDecimal(0)) > 0){


                        System.err.println("2222222222222222222222");


                        SettlementDetail settlementDetail = new SettlementDetail();


                        settlementDetail.setOrderId(orderId);


                        settlementDetail.setOrderType(1);