2.19 文档55

luo

2024-02-19 c56014d8d29a03a86c8422f300654be260ecd456

 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);
@@ -430,8 +434,29 @@
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_chinese = document.getElementById("yhq_chinese");
                            yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                            yhq_chinese_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_chinese = document.getElementById("zk_chinese");
                            zk_chinese.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_chinese_div = document.getElementById("zk_chinese_div");
                            zk_chinese_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_chinese = document.getElementById("hb_chinese");
                            hb_chinese.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_chinese_div = document.getElementById("hb_chinese_div");
                            hb_chinese_div.remove();
                        }
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        xj_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("手机支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -469,8 +494,29 @@
                        title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        Element xcf_english = document.getElementById("xcf_english");
                        xcf_english.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_english = document.getElementById("yhq_english");
                            yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_english_div = document.getElementById("yhq_english_div");
                            yhq_english_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_english = document.getElementById("zk_english");
                            zk_english.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_english_div = document.getElementById("zk_english_div");
                            zk_english_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_english = document.getElementById("hb_english");
                            hb_english.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_english_div = document.getElementById("hb_english_div");
                            hb_english_div.remove();
                        }
                        Element xj_english = document.getElementById("xj_english");
                        xj_english.text("GHS " + orderLogistics.getOrderMoney());
                        xj_english.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_english = document.getElementById("pay_type_english");
                        pay_type_english.text("Mobile money");
                        Element pay_money_english = document.getElementById("pay_money_english");
@@ -508,8 +554,29 @@
                        title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        Element xcf_french = document.getElementById("xcf_french");
                        xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_french = document.getElementById("yhq_french");
                            yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_french_div = document.getElementById("yhq_french_div");
                            yhq_french_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_french = document.getElementById("zk_french");
                            zk_french.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_french_div = document.getElementById("zk_french_div");
                            zk_french_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_french = document.getElementById("hb_french");
                            hb_french.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_french_div = document.getElementById("hb_french_div");
                            hb_french_div.remove();
                        }
                        Element xj_french = document.getElementById("xj_french");
                        xj_french.text("GHS " + orderLogistics.getOrderMoney());
                        xj_french.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_french = document.getElementById("pay_type_french");
                        pay_type_french.text("Argent mobile");
                        Element pay_money_french = document.getElementById("pay_money_french");
@@ -613,8 +680,29 @@
                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_chinese = document.getElementById("yhq_chinese");
                            yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                            yhq_chinese_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_chinese = document.getElementById("zk_chinese");
                            zk_chinese.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_chinese_div = document.getElementById("zk_chinese_div");
                            zk_chinese_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_chinese = document.getElementById("hb_chinese");
                            hb_chinese.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_chinese_div = document.getElementById("hb_chinese_div");
                            hb_chinese_div.remove();
                        }
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        xj_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("银行卡支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -652,8 +740,29 @@
                        title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        Element xcf_english = document.getElementById("xcf_english");
                        xcf_english.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_english = document.getElementById("yhq_english");
                            yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_english_div = document.getElementById("yhq_english_div");
                            yhq_english_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_english = document.getElementById("zk_english");
                            zk_english.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_english_div = document.getElementById("zk_english_div");
                            zk_english_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_english = document.getElementById("hb_english");
                            hb_english.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_english_div = document.getElementById("hb_english_div");
                            hb_english_div.remove();
                        }
                        Element xj_english = document.getElementById("xj_english");
                        xj_english.text("GHS " + orderLogistics.getOrderMoney());
                        xj_english.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_english = document.getElementById("pay_type_english");
                        pay_type_english.text("Bank card");
                        Element pay_money_english = document.getElementById("pay_money_english");
@@ -691,8 +800,29 @@
                        title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        Element xcf_french = document.getElementById("xcf_french");
                        xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_french = document.getElementById("yhq_french");
                            yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_french_div = document.getElementById("yhq_french_div");
                            yhq_french_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_french = document.getElementById("zk_french");
                            zk_french.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_french_div = document.getElementById("zk_french_div");
                            zk_french_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_french = document.getElementById("hb_french");
                            hb_french.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_french_div = document.getElementById("hb_french_div");
                            hb_french_div.remove();
                        }
                        Element xj_french = document.getElementById("xj_french");
                        xj_french.text("GHS " + orderLogistics.getOrderMoney());
                        xj_french.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_french = document.getElementById("pay_type_french");
                        pay_type_french.text("Carte bancaire");
                        Element pay_money_french = document.getElementById("pay_money_french");
@@ -796,8 +926,29 @@
                        title_chinese.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        Element xcf_chinese = document.getElementById("xcf_chinese");
                        xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_chinese = document.getElementById("yhq_chinese");
                            yhq_chinese.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                            yhq_chinese_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_chinese = document.getElementById("zk_chinese");
                            zk_chinese.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_chinese_div = document.getElementById("zk_chinese_div");
                            zk_chinese_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_chinese = document.getElementById("hb_chinese");
                            hb_chinese.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_chinese_div = document.getElementById("hb_chinese_div");
                            hb_chinese_div.remove();
                        }
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        xj_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("余额支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
@@ -835,8 +986,29 @@
                        title_english.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        Element xcf_english = document.getElementById("xcf_english");
                        xcf_english.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_english = document.getElementById("yhq_english");
                            yhq_english.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_english_div = document.getElementById("yhq_english_div");
                            yhq_english_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_english = document.getElementById("zk_english");
                            zk_english.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_english_div = document.getElementById("zk_english_div");
                            zk_english_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_english = document.getElementById("hb_english");
                            hb_english.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_english_div = document.getElementById("hb_english_div");
                            hb_english_div.remove();
                        }
                        Element xj_english = document.getElementById("xj_english");
                        xj_english.text("GHS " + orderLogistics.getOrderMoney());
                        xj_english.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_english = document.getElementById("pay_type_english");
                        pay_type_english.text("I-GO Wallet");
                        Element pay_money_english = document.getElementById("pay_money_english");
@@ -874,8 +1046,29 @@
                        title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        Element xcf_french = document.getElementById("xcf_french");
                        xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                        if(null != orderLogistics.getCouponMoney() && orderLogistics.getCouponMoney() > 0){
                            Element yhq_french = document.getElementById("yhq_french");
                            yhq_french.text("GHS -" + orderLogistics.getCouponMoney());
                        }else{
                            Element yhq_french_div = document.getElementById("yhq_french_div");
                            yhq_french_div.remove();
                        }
                        if(null != orderLogistics.getDiscountMoney() && orderLogistics.getDiscountMoney() > 0){
                            Element zk_french = document.getElementById("zk_french");
                            zk_french.text("GHS -" + orderLogistics.getDiscountMoney());
                        }else{
                            Element zk_french_div = document.getElementById("zk_french_div");
                            zk_french_div.remove();
                        }
                        if(null != orderLogistics.getRedPacketMoney() && orderLogistics.getRedPacketMoney() > 0){
                            Element hb_french = document.getElementById("hb_french");
                            hb_french.text("GHS -" + orderLogistics.getRedPacketMoney());
                        }else{
                            Element hb_french_div = document.getElementById("hb_french_div");
                            hb_french_div.remove();
                        }
                        Element xj_french = document.getElementById("xj_french");
                        xj_french.text("GHS " + orderLogistics.getOrderMoney());
                        xj_french.text("GHS " + orderLogistics.getPayMoney());
                        Element pay_type_french = document.getElementById("pay_type_french");
                        pay_type_french.text("Portefeuille I-GO");
                        Element pay_money_french = document.getElementById("pay_money_french");
@@ -977,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();
    }