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


@@ -323,6 +323,8 @@




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




                    System.err.println("1111111111111111111111111");




                    double sum = 0;


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


                        sum= orderLogistics.getOrderMoney();


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


                    }


                    //记录司机待结算金额


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


                        System.err.println("2222222222222222222222");


                        SettlementDetail settlementDetail = new SettlementDetail();


                        settlementDetail.setOrderId(orderId);


                        settlementDetail.setOrderType(1);


@@ -427,7 +430,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 +676,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 +922,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 +1169,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();


    }