更新接口

puzhibing

2023-12-01 ddcef762ff4a159e132c68dfec512c60a68a53e6

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java

@@ -109,7 +109,10 @@
     */
    @Override
    public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
        return orderLogisticsMapper.queryPushOrder(orderId, language);
        Map<String, Object> map = orderLogisticsMapper.queryPushOrder(orderId, language);
        String travelTime = map.get("travelTime").toString();
        map.put("travelTime", DateUtil.conversionFormat1(language, travelTime));
        return map;
    }


@@ -127,7 +130,7 @@
            return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
        }
        if(orderLogistics.getState() != 1){
            return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
            return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
        }
        Driver driver = driverService.selectById(uid);
        orderLogistics.setDriverId(uid);
@@ -210,8 +213,11 @@
     * @throws Exception
     */
    @Override
    public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
        return orderLogisticsMapper.queryOrderInfo(orderId);
    public Map<String, Object> queryOrderInfo(Integer language, Integer orderId) throws Exception {
        Map<String, Object> map = orderLogisticsMapper.queryOrderInfo(orderId);
        String travelTime_ = map.get("travelTime_").toString();
        map.put("travelTime_", DateUtil.conversionFormat1(language, travelTime_));
        return map;
    }


@@ -302,13 +308,13 @@
                    String path = templatePath + "user/receiptLogistics.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                    Driver driver = driverService.selectById(orderLogistics.getDriverId());
                    if(1 == language){
                        document.getElementById("english").remove();
                        document.getElementById("french").remove();
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        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());
                        Element xj_chinese = document.getElementById("xj_chinese");
@@ -324,7 +330,7 @@
//                    Element track_chinese = document.getElementById("track_chinese");
//                    track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_chinese = document.getElementById("pay_time_chinese");
                        pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_chinese = document.getElementsByClass("driver_chinese");
                        for (int i = 0; i < driver_chinese.size(); i++) {
                            Element element = driver_chinese.get(i);
@@ -342,7 +348,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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());
                        Element xj_english = document.getElementById("xj_english");
@@ -358,7 +364,7 @@
//                    Element track_english = document.getElementById("track_english");
//                    track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_english = document.getElementById("pay_time_english");
                        pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_english = document.getElementsByClass("driver_english");
                        for (int i = 0; i < driver_english.size(); i++) {
                            Element element = driver_english.get(i);
@@ -376,7 +382,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        Element title_french = document.getElementById("title_french");
                        title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        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());
                        Element xj_french = document.getElementById("xj_french");
@@ -392,7 +398,7 @@
//                    Element track_french = document.getElementById("track_french");
//                    track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_french = document.getElementById("pay_time_french");
                        pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_french = document.getElementsByClass("driver_french");
                        for (int i = 0; i < driver_french.size(); i++) {
                            Element element = driver_french.get(i);
@@ -460,13 +466,13 @@
                    String path = templatePath + "user/receiptLogistics.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                    Driver driver = driverService.selectById(orderLogistics.getDriverId());
                    if(1 == language){
                        document.getElementById("english").remove();
                        document.getElementById("french").remove();
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        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());
                        Element xj_chinese = document.getElementById("xj_chinese");
@@ -482,7 +488,7 @@
//                    Element track_chinese = document.getElementById("track_chinese");
//                    track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_chinese = document.getElementById("pay_time_chinese");
                        pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_chinese = document.getElementsByClass("driver_chinese");
                        for (int i = 0; i < driver_chinese.size(); i++) {
                            Element element = driver_chinese.get(i);
@@ -500,7 +506,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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());
                        Element xj_english = document.getElementById("xj_english");
@@ -516,7 +522,7 @@
//                    Element track_english = document.getElementById("track_english");
//                    track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_english = document.getElementById("pay_time_english");
                        pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_english = document.getElementsByClass("driver_english");
                        for (int i = 0; i < driver_english.size(); i++) {
                            Element element = driver_english.get(i);
@@ -534,7 +540,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        Element title_french = document.getElementById("title_french");
                        title_french.text(sdf.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        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());
                        Element xj_french = document.getElementById("xj_french");
@@ -550,7 +556,7 @@
//                    Element track_french = document.getElementById("track_french");
//                    track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_french = document.getElementById("pay_time_french");
                        pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_french = document.getElementsByClass("driver_french");
                        for (int i = 0; i < driver_french.size(); i++) {
                            Element element = driver_french.get(i);
@@ -618,13 +624,13 @@
                    String path = templatePath + "user/receiptLogistics.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm");
                    SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
                    Driver driver = driverService.selectById(orderLogistics.getDriverId());
                    if(1 == language){
                        document.getElementById("english").remove();
                        document.getElementById("french").remove();
                        Element title_chinese = document.getElementById("title_chinese");
                        title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());
                        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());
                        Element xj_chinese = document.getElementById("xj_chinese");
@@ -640,7 +646,7 @@
//                    Element track_chinese = document.getElementById("track_chinese");
//                    track_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_chinese = document.getElementById("pay_time_chinese");
                        pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_chinese.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_chinese = document.getElementsByClass("driver_chinese");
                        for (int i = 0; i < driver_chinese.size(); i++) {
                            Element element = driver_chinese.get(i);
@@ -658,7 +664,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("french").remove();
                        Element title_english = document.getElementById("title_english");
                        title_english.text(sdf2.format(orderLogistics.getTravelTime()) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");
                        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());
                        Element xj_english = document.getElementById("xj_english");
@@ -674,7 +680,7 @@
//                    Element track_english = document.getElementById("track_english");
//                    track_english.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_english = document.getElementById("pay_time_english");
                        pay_time_english.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_english.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_english = document.getElementsByClass("driver_english");
                        for (int i = 0; i < driver_english.size(); i++) {
                            Element element = driver_english.get(i);
@@ -692,7 +698,7 @@
                        document.getElementById("chinese").remove();
                        document.getElementById("english").remove();
                        Element title_french = document.getElementById("title_french");
                        title_french.text(sdf2.format(orderLogistics.getTravelTime()) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");
                        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());
                        Element xj_french = document.getElementById("xj_french");
@@ -708,7 +714,7 @@
//                    Element track_french = document.getElementById("track_french");
//                    track_french.attr("href", "http://182.160.16.251:81/mailbox/user/location.html");
                        Element pay_time_french = document.getElementById("pay_time_french");
                        pay_time_french.text(sdf1.format(orderLogistics.getTravelTime()));
                        pay_time_french.text(DateUtil.conversionFormat(language, sdf1.format(orderLogistics.getTravelTime())));
                        Elements driver_french = document.getElementsByClass("driver_french");
                        for (int i = 0; i < driver_french.size(); i++) {
                            Element element = driver_french.get(i);
@@ -787,7 +793,7 @@
    public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode, Integer language) throws Exception {
        OrderLogistics orderLogistics = this.selectById(orderId);
        if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
            return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failure" : "Échec de vérification");
            return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failed" : "Echec de la validation");
        }
        orderLogistics.setState(9);
        this.updateById(orderLogistics);
@@ -807,7 +813,7 @@
        OrderLogisticsSpread query = orderLogisticsSpreadService.query(orderId);
        OrderLogistics orderLogistics = this.selectById(orderId);
        if(orderLogistics.getState() != 4 && orderLogistics.getState() != 8){
            return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "Price difference is not allowed" : "Les spreads ne sont pas autorisés");
            return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "To set price difference is not allowed." : "Il n’est pas permis de définir une différence de prix.");
        }
        if(query != null){
            query.setPrice(difference);
@@ -832,7 +838,12 @@

    @Override
    public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
        return orderLogisticsMapper.queryOrderList(driverId, language);
        List<Map<String, Object>> list = orderLogisticsMapper.queryOrderList(driverId, language);
        for (Map<String, Object> map : list) {
            String time = map.get("time").toString();
            map.put("time", DateUtil.conversionFormat(language, time));
        }
        return list;
    }

    /**
@@ -844,7 +855,12 @@
     */
    @Override
    public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
        return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
        List<Map<String, Object>> list = orderLogisticsMapper.queryMyAllOrder(state, uid, language);
        for (Map<String, Object> map : list) {
            String time = map.get("time").toString();
            map.put("time", DateUtil.conversionFormat(language, time));
        }
        return list;
    }


@@ -862,7 +878,7 @@
            return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
        }
        if(orderLogistics.getState() != 1){
            return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦！" : language == 2 ? "Hand speed is a little slow oh, the order has been robbed!" : "La main est un peu lente oh, l’ordre a été volé!");
            return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "Too slow, order was snatched!" : "Trop lent, l’ordre a été arraché!");
        }
        Driver driver = driverService.selectById(uid);
        orderLogistics.setDriverId(uid);