Merge remote-tracking branch 'origin/dev' into dev

luo

2024-02-19 704784eeca74c4d96ed335ed121809520f9a76f4

 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,6 +323,8 @@
                }

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

                    System.err.println("1111111111111111111111111");

                    double sum = 0;
                    if (orderLogistics.getPayType()==4){
@@ -351,6 +354,7 @@
                    }
                    //记录司机待结算金额
                    if(d.compareTo(new BigDecimal(0)) > 0){
                        System.err.println("2222222222222222222222");
                        SettlementDetail settlementDetail = new SettlementDetail();
                        settlementDetail.setOrderId(orderId);
                        settlementDetail.setOrderType(1);
@@ -427,7 +431,7 @@
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("I-GO电子收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
@@ -673,7 +677,7 @@
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("I-GO电子收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
@@ -919,7 +923,7 @@
                        document.getElementById("french").remove();
                        document.getElementsByTag("title").get(0).text("I-GO电子收据");
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO此订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
@@ -1166,7 +1170,7 @@
        if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
            return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
        }
        orderLogistics.setState(9);
        orderLogistics.setState(6);
        this.updateById(orderLogistics);
        return ResultUtil.success();
    }