修改bug

puzhibing

2023-12-22 c27525d7f3d39d9472ce9e8a386cdbae4e159a4c

修改bug

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/GunsApplication.java

@@ -46,10 +46,10 @@
    }


    @PostConstruct
    void started() {
        TimeZone.setDefault(TimeZone.getTimeZone("GMT+0"));
    }
//    @PostConstruct
//    void started() {
//        TimeZone.setDefault(TimeZone.getTimeZone("GMT+0"));
//    }


    @Bean //SpringCloud内部服务质检使用服务名调用

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/DriverController.java

@@ -12,6 +12,8 @@
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.ALiSendSms;
import com.stylefeng.guns.modular.system.util.DateUtil;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import com.stylefeng.guns.modular.system.util.ResultUtil;
import com.stylefeng.guns.modular.system.warpper.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
@@ -20,6 +22,7 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -374,13 +377,24 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
    })
    public ResultUtil<?> getEmailList(HttpServletRequest request){
    public ResultUtil<List<EmailWarpper>> getEmailList(Integer language, HttpServletRequest request){
        try {
            Integer uid = driverService.getUserIdFormRedis(request);
            if(null == uid){
                return ResultUtil.tokenErr();
            }
            return ResultUtil.success(emailService.selectList(new EntityWrapper<TEmail>().eq("userId",uid).eq("type",2).orderBy("createTime",false)));
            List<TEmail> tEmails = emailService.selectList(new EntityWrapper<TEmail>().eq("userId", uid).eq("type", 2).orderBy("createTime", false));
            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            List<EmailWarpper> list = new ArrayList<>();
            for (TEmail tEmail : tEmails) {
                EmailWarpper warpper = new EmailWarpper();
                BeanUtils.copyProperties(tEmail, warpper);
                warpper.setCreateTime(DateUtil.conversionFormat(language, sdf.format(tEmail.getCreateTime())));
                int i = cn.hutool.core.date.DateUtil.dayOfWeek(tEmail.getCreateTime())-1;
                warpper.setWeek(EmailUtil.getWeek(language,i));
                list.add(warpper);
            }
            return ResultUtil.success(list);
        }catch (Exception e){
            e.printStackTrace();
            return ResultUtil.runErr();

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

@@ -210,200 +210,6 @@
        systemNoticeService.addSystemNotice(1, language == 1 ? "您的订单已指派给" + driver.getFirstName() + "师傅，请保持电话畅通！" :
                language == 2 ? "Your order has been assigned to the driver- " + driver.getFirstName() + ", please keep your line on."
                        : "Votre commande a été attribuée au chauffeur- " + driver.getFirstName() + ", S'il vous plaît, restez en ligne.", orderLogistics.getUserId());

        UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());

        if(ToolUtil.isNotEmpty(userInfo.getEmail())){
            new Thread(new Runnable() {
                @Override
                public void run() {
                    try {
                        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");
                        Driver driver = driverService.selectById(orderLogistics.getDriverId());
                        Car car = carMapper.selectById(orderLogistics.getCarId());
                        Double aDouble = 0D;
                        if(null != orderLogistics.getDriverId()){
                            aDouble = orderEvaluateService.queryDriverScore(orderLogistics.getDriverId());
                        }
                        if(1 == language){
                            document.getElementById("english").remove();
                            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());
                            Element xcf_chinese = document.getElementById("xcf_chinese");
                            xcf_chinese.text("GHS " + orderLogistics.getOrderMoney());
                            Element xj_chinese = document.getElementById("xj_chinese");
                            xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                            Element pay_type_chinese = document.getElementById("pay_type_chinese");
                            pay_type_chinese.text(orderLogistics.getPayType() == 1 ? "手机" : orderLogistics.getPayType() == 2 ? "银行卡" : orderLogistics.getPayType() == 3 ? "余额" : "现金");
                            Element pay_money_chinese = document.getElementById("pay_money_chinese");
                            pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
                            Element pdf_chinese = document.getElementById("pdf_chinese");
                            pdf_chinese.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
                            Element lost_item_chinese = document.getElementById("lost_item_chinese");
                            lost_item_chinese.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
//                    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(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);
                                element.text(driver.getFirstName() + "." + driver.getLastName());
                            }
                            Element cp_chinese = document.getElementById("cp_chinese");
                            cp_chinese.text("车牌：" + car.getCarLicensePlate());
                            Element pf_chinese = document.getElementById("pf_chinese");
                            pf_chinese.text("司机评分：" + aDouble);
                            Element start_address_chinese = document.getElementById("start_address_chinese");
                            start_address_chinese.text(orderLogistics.getStartAddress());
                            Element end_address_chinese = document.getElementById("end_address_chinese");
                            end_address_chinese.text(orderLogistics.getEndAddress());
                            Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                            Element server_tel_chinese = document.getElementById("server_tel_chinese");
                            server_tel_chinese.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                        }
                        if(2 == language){
                            document.getElementById("chinese").remove();
                            document.getElementById("french").remove();
                            document.getElementsByTag("title").get(0).text("Receipt");
                            Element title_english = document.getElementById("title_english");
                            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");
                            xj_english.text("GHS " + orderLogistics.getOrderMoney());
                            Element pay_type_english = document.getElementById("pay_type_english");
                            pay_type_english.text(orderLogistics.getPayType() == 1 ? "Mobile" : orderLogistics.getPayType() == 2 ? "Bank card" : orderLogistics.getPayType() == 3 ? "Balance" : "Cash");
                            Element pay_money_english = document.getElementById("pay_money_english");
                            pay_money_english.text("GHS " + orderLogistics.getPayMoney());
                            Element pdf_english = document.getElementById("pdf_english");
                            pdf_english.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
                            Element lost_item_english = document.getElementById("lost_item_english");
                            lost_item_english.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
//                    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(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);
                                element.text(driver.getFirstName() + "." + driver.getLastName());
                            }
                            Element cp_english = document.getElementById("cp_english");
                            cp_english.text("Number Plate：" + car.getCarLicensePlate());
                            Element pf_english = document.getElementById("pf_english");
                            pf_english.text("Driver Rating：" + aDouble);
                            Element start_address_english = document.getElementById("start_address_english");
                            start_address_english.text(orderLogistics.getStartAddress());
                            Element end_address_english = document.getElementById("end_address_english");
                            end_address_english.text(orderLogistics.getEndAddress());
                            Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                            Element server_tel_english = document.getElementById("server_tel_english");
                            server_tel_english.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                        }
                        if(3 == language){
                            document.getElementById("chinese").remove();
                            document.getElementById("english").remove();
                            document.getElementsByTag("title").get(0).text("Reçu");
                            Element title_french = document.getElementById("title_french");
                            title_french.text("Le " + DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + ", vous avez dépensé GHS " + orderLogistics.getPayMoney() + " sur le voyage");
                            Element xcf_french = document.getElementById("xcf_french");
                            xcf_french.text("GHS " + orderLogistics.getOrderMoney());
                            Element xj_french = document.getElementById("xj_french");
                            xj_french.text("GHS " + orderLogistics.getOrderMoney());
                            Element pay_type_french = document.getElementById("pay_type_french");
                            pay_type_french.text(orderLogistics.getPayType() == 1 ? "Mobile" : orderLogistics.getPayType() == 2 ? "Carte bancaire" : orderLogistics.getPayType() == 3 ? "Le solde" : "Espèces");
                            Element pay_money_french = document.getElementById("pay_money_french");
                            pay_money_french.text("GHS " + orderLogistics.getPayMoney());
                            Element pdf_french = document.getElementById("pdf_french");
                            pdf_french.attr("href", "http://182.160.16.251:80/user/base/order/uploadReceiptPdf?orderId=" + orderId + "&orderType=4");
                            Element lost_item_french = document.getElementById("lost_item_french");
                            lost_item_french.attr("href", "http://182.160.16.251:81/mailbox/user/lossGoods.html?language=" + language + "&orderId=" + orderId + "&orderType=4");
//                    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(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);
                                element.text(driver.getFirstName() + "." + driver.getLastName());
                            }
                            Element cp_french = document.getElementById("cp_french");
                            cp_french.text("Plaque: GS " + car.getCarLicensePlate());
                            Element pf_french = document.getElementById("pf_french");
                            pf_french.text("Note du chauffeur: " + aDouble);
                            Element start_address_french = document.getElementById("start_address_french");
                            start_address_french.text(orderLogistics.getStartAddress());
                            Element end_address_french = document.getElementById("end_address_french");
                            end_address_french.text(orderLogistics.getEndAddress());
                            Phone phone = phoneService.selectOne(new EntityWrapper<Phone>().eq("type", 2).eq("companyId", driver.getCompanyId()));
                            Element server_tel_french = document.getElementById("server_tel_french");
                            server_tel_french.attr("href", "tel:" + (null != phone ? phone.getPhone() : ""));
                        }

                        EmailUtil.send(userInfo.getEmail(), language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu",  document.html());

                        //开始生成pdf收据和html收据
                        File file = new File("/usr/local/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        file = new File("/usr/local/nginx/html/files/html/parcel_receipt_" + orderId + ".html");
                        if(!file.exists()){
                            file.createNewFile();
                        }
                        FileWriter fileWriter = new FileWriter(file);
                        fileWriter.write(document.html());
                        fileWriter.flush();
                        fileWriter.close();
                        FileInputStream fileInputStream = new FileInputStream(file);
                        File file1 = new File("/usr/local/nginx/html/files/pdf/");
                        if(!file1.exists()){
                            file1.mkdirs();
                        }
                        file1 = new File("/usr/local/nginx/html/files/pdf/parcel_receipt_" + orderId + ".pdf");
                        if(!file1.exists()){
                            file1.createNewFile();
                        }
                        try{
                            FileOutputStream fileOutputStream = new FileOutputStream(file1);
                            HtmlToPdfUtils.convertToPdf(fileInputStream, "IGO", fileOutputStream);
                        }catch (Exception e){
                            e.printStackTrace();
                            System.out.println("html转pdf异常");
                        }

                        String link ="http://182.160.16.251:81/files/html/parcel_receipt_" + orderId + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(uid);
                        tEmail.setType(1);
                        tEmail.setName(language == 1 ? "I-GO电子收据" : language == 2 ? "Receipt" : "Reçu");
                        tEmail.setOrderId(orderId);
                        tEmail.setCreateTime(new Date());
                        int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
                        String week = EmailUtil.getWeek(language, i);
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        }
                        emailService.insert(tEmail);

                    }catch (Exception e){
                        e.printStackTrace();
                    }
                }
            }).start();
        }

        return ResultUtil.success();
    }

@@ -438,6 +244,9 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, Integer language) throws Exception {
        OrderLogistics orderLogistics = this.selectById(orderId);
        if(orderLogistics.getState().compareTo(state) == 0){
            return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
        }
        switch (state){
            case 3://出发前往预约点
                orderLogistics.setState(3);
@@ -507,6 +316,7 @@

        if(state == 6){
            UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
            language = userInfo.getLanguage();
            if(orderLogistics.getPayType() == 1){
                if(ToolUtil.isNotEmpty(userInfo.getEmail())){
                    String path = templatePath + "user/receiptLogistics.html";
@@ -530,7 +340,7 @@
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("手机");
                        pay_type_chinese.text("手机支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
                        pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -569,7 +379,7 @@
                        Element xj_english = document.getElementById("xj_english");
                        xj_english.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_english = document.getElementById("pay_type_english");
                        pay_type_english.text("Mobile");
                        pay_type_english.text("Mobile money");
                        Element pay_money_english = document.getElementById("pay_money_english");
                        pay_money_english.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_english = document.getElementById("pdf_english");
@@ -608,7 +418,7 @@
                        Element xj_french = document.getElementById("xj_french");
                        xj_french.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_french = document.getElementById("pay_type_french");
                        pay_type_french.text("Mobile");
                        pay_type_french.text("Argent mobile");
                        Element pay_money_french = document.getElementById("pay_money_french");
                        pay_money_french.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_french = document.getElementById("pdf_french");
@@ -682,9 +492,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);

@@ -713,7 +523,7 @@
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("银行卡");
                        pay_type_chinese.text("银行卡支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
                        pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -865,9 +675,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);

@@ -896,7 +706,7 @@
                        Element xj_chinese = document.getElementById("xj_chinese");
                        xj_chinese.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_chinese = document.getElementById("pay_type_chinese");
                        pay_type_chinese.text("余额");
                        pay_type_chinese.text("余额支付");
                        Element pay_money_chinese = document.getElementById("pay_money_chinese");
                        pay_money_chinese.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_chinese = document.getElementById("pdf_chinese");
@@ -935,7 +745,7 @@
                        Element xj_english = document.getElementById("xj_english");
                        xj_english.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_english = document.getElementById("pay_type_english");
                        pay_type_english.text("balance");
                        pay_type_english.text("I-GO Wallet");
                        Element pay_money_english = document.getElementById("pay_money_english");
                        pay_money_english.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_english = document.getElementById("pdf_english");
@@ -974,7 +784,7 @@
                        Element xj_french = document.getElementById("xj_french");
                        xj_french.text("GHS " + orderLogistics.getOrderMoney());
                        Element pay_type_french = document.getElementById("pay_type_french");
                        pay_type_french.text("Le solde");
                        pay_type_french.text("Portefeuille I-GO");
                        Element pay_money_french = document.getElementById("pay_money_french");
                        pay_money_french.text("GHS " + orderLogistics.getPayMoney());
                        Element pdf_french = document.getElementById("pdf_french");
@@ -1048,9 +858,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                }
@@ -1234,15 +1044,21 @@

    @Override
    public void sendVerificationCode(Integer orderId, Integer language) throws Exception {
        String value = redisUtil.getValue("PickUpCode_" + orderId);
        if(ToolUtil.isNotEmpty(value)){
            return;
        }
        OrderLogistics orderLogistics = this.selectById(orderId);
        String random = "";
        for(int i = 0; i < 6; i++){
            random += Double.valueOf(Math.random() * 10).intValue();
        }
        redisUtil.setStrValue("PickUpCode_" + orderId, random, 600);
        orderLogistics.setPickUpCode(random);
        this.updateById(orderLogistics);

        UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
        language = userInfo.getLanguage();
        if(ToolUtil.isNotEmpty(userInfo.getEmail())){
            String path = templatePath + "driver/index.html";
            Document document = Jsoup.parse(new File(path), "UTF-8");
@@ -1331,9 +1147,9 @@
            tEmail.setWeek(week);
            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
            if(am){
                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
            }else {
                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
            }
            emailService.insert(tEmail);
        }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java

@@ -279,21 +279,15 @@
    @Override
    public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone, Integer language) throws Exception {
        OrderPrivateCar orderPrivateCar = this.selectById(orderId);
//        if(state==5){
//            UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
//            if(!userInfo.getPhone().substring(7, userInfo.getPhone().length()).equals(phone)){
//                return ResultUtil.error("手机号错误");
//            }
//        }
        if(orderPrivateCar.getState().compareTo(state) == 0){
            return ResultUtil.error(language == 1 ? "不能重复操作" : language == 2 ? "Unable to recur operate" : "Impossible de récurrence des opérer");
        }
        if(state==3 && orderPrivateCar.getState()!=2){
            return ResultUtil.error(language == 1 ? "当前订单不能触发前往预约地点" : language == 2 ? "The current order cannot trigger travel to the reservation" : "La commande en cours ne peut pas déclencher une visite au lieu de rendez-vous");
        }
        if(state==4 && orderPrivateCar.getState()!=3){
            return ResultUtil.error(language == 1 ? "当前订单不能到达预约地点" : language == 2 ? "The current order cannot arrive at the reservation" : "La commande en cours ne peut pas atteindre le rendez-vous");
        }
        /*if(state==5 && orderPrivateCar.getState()!=4){
            return ResultUtil.error("当前订单不能开始服务");
        }*/
        switch (state){
            case 3://出发前往预约点
                orderPrivateCar.setState(3);

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverActivityRegisteredMapper.xml

@@ -19,7 +19,7 @@
    <select id="query" resultType="map">
        select
        a.id as id,
        CONCAT('邀请', if(a.`type` = 1, '司机', '用户'), '注册奖励', a.money, '元') as content,
        CONCAT('邀请', if(a.`type` = 1, '司机', '用户'), '注册奖励GHS', a.money) as content,
        a.money as money
        from t_driver_activity_registered a
        left join t_driver_activity b on (a.driverActivityId = b.id)

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/IncomeMapper.xml

@@ -21,7 +21,7 @@
        orderType as orderType,
        money as money,
        DATE_FORMAT(insertTime, '%Y-%m-%d %H:%i') as time
        from t_income where 1 = 1
        from t_income where money > 0
        <if test="null != userType">
            and userType = #{userType}
        </if>

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/UserInfo.java

@@ -143,6 +143,11 @@
     */
    @TableField("state")
    private Integer state;
    /**
     * 当前语言
     */
    @TableField("language")
    private Integer language;

    private BigDecimal freeMoney;

@@ -361,6 +366,14 @@
        this.appletsOpenId = appletsOpenId;
    }

    public Integer getLanguage() {
        return language;
    }

    public void setLanguage(Integer language) {
        this.language = language;
    }

    @Override
    public String toString() {
        return "UserInfo{" +

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java

@@ -425,9 +425,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                }
@@ -613,9 +613,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                }
@@ -880,9 +880,9 @@
            tEmail.setWeek(week);
            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
            if(am){
                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
            }else {
                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
            }
            emailService.insert(tEmail);
        }
@@ -994,9 +994,9 @@
            tEmail.setWeek(week);
            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
            if(am){
                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
            }else {
                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
            }
            emailService.insert(tEmail);
        }
@@ -1505,9 +1505,9 @@
            tEmail.setWeek(week);
            boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
            if(am){
                tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
            }else {
                tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
            }
            emailService.insert(tEmail);
        }
@@ -1669,14 +1669,14 @@
                case 1://邀请司机注册
                    DriverActivityRegistered driverActivityRegistered = driverActivityRegisteredMapper.selectById(dah.getActivityId());
                    activityWarpper.setId(driverActivityRegistered.getId());
                    activityWarpper.setContent(language == 1 ? "邀请司机注册奖励" + driverActivityRegistered.getMoney() + "元" :
                    activityWarpper.setContent(language == 1 ? "邀请司机注册奖励GHS" + driverActivityRegistered.getMoney() :
                            language == 2 ? " Invite drivers to register for a reward of GHS" + driverActivityRegistered.getMoney():
                                    "Invitez les chauffeurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered.getMoney());
                    break;
                case 2://邀请用户注册
                    DriverActivityRegistered driverActivityRegistered1 = driverActivityRegisteredMapper.selectById(dah.getActivityId());
                    activityWarpper.setId(driverActivityRegistered1.getId());
                    activityWarpper.setContent(language == 1 ? "邀请用户注册奖励" + driverActivityRegistered1.getMoney() + "元" :
                    activityWarpper.setContent(language == 1 ? "邀请用户注册奖励GHS" + driverActivityRegistered1.getMoney() :
                            language == 2 ? "Invite users to register for a reward of GHS" + driverActivityRegistered1.getMoney():
                                    "Invitez les utilisateurs à s’inscrire pour une récompense de GHS" + driverActivityRegistered1.getMoney());
                    break;
@@ -1704,7 +1704,7 @@
                            sb.append(language == 1 ? "包裹" : language == 2 ? "package" : "de colis");
                            break;
                    }
                    String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励" +driverActivityOnline.getMoney() + "元" :
                    String str = language == 1 ? "累计在线" +driverActivityOnline.getOnline() + "小时奖励GHS" +driverActivityOnline.getMoney():
                            language == 2 ? " for " + driverActivityOnline.getOnline() + " hours to get a reward of GHS" + driverActivityOnline.getMoney():
                                    " pendant " + driverActivityOnline.getOnline() + " heures afin d'obtenir une récompense de GHS" + driverActivityOnline.getMoney();
                    activityWarpper.setContent(sb.append(str).toString());
@@ -1713,7 +1713,7 @@
                case 4://订单量
                    DriverActivityOrder driverActivityOrder = driverActivityOrderMapper.selectById(dah.getActivityId());
                    activityWarpper.setId(driverActivityOrder.getId());
                    activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励" + driverActivityOrder.getMoney() + "元" :
                    activityWarpper.setContent(language == 1 ? "今日" + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + "累计接单" + driverActivityOrder.getOrderNum() + "单奖励GHS" + driverActivityOrder.getMoney():
                            language == 2 ? "Today " + driverActivityOrder.getStart() + "-" + driverActivityOrder.getEnd() + ", complete " + driverActivityOrder.getOrderNum() + " orders for a reward of GHS" + driverActivityOrder.getMoney() :
                                    "Aujourd’hui de " + driverActivityOrder.getStart() + " à " + driverActivityOrder.getEnd() + ", complétez " + driverActivityOrder.getOrderNum() + " commandes pour une récompense de GHS" + driverActivityOrder.getMoney());
                    SimpleDateFormat sdf = new SimpleDateFormat("H:m");
@@ -1869,9 +1869,9 @@
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                    }
@@ -1985,9 +1985,9 @@
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                    }
@@ -2102,9 +2102,9 @@
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                    }
@@ -2219,9 +2219,9 @@
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                    }
@@ -2355,9 +2355,9 @@
                        tEmail.setWeek(week);
                        boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                        if(am){
                            tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                            tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                        }else {
                            tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                            tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                        }
                        emailService.insert(tEmail);
                    }
@@ -2475,9 +2475,9 @@
                    tEmail.setWeek(week);
                    boolean am = cn.hutool.core.date.DateUtil.isAM(new Date());
                    if(am){
                        tEmail.setAmOrPm(language==1?"上午":language==2?"AM":"Dans la matinée");
                        tEmail.setAmOrPm(language==1?"上午":language==2?"morning":"matin");
                    }else {
                        tEmail.setAmOrPm(language==1?"下午":language==2?"PM":"après-midi");
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/EmailUtil.java

@@ -151,25 +151,25 @@
        }else {
            switch (i) {
                case 1:
                    week = "lundi";
                    week = "Lundi";
                    break;
                case 2:
                    week = "Mardi mardi ";
                    week = "Mardi";
                    break;
                case 3:
                    week = "mercredi";
                    week = "Mercredi";
                    break;
                case 4:
                    week = "jeudi";
                    week = "Jeudi";
                    break;
                case 5:
                    week = "vendredi";
                    week = "Vendredi";
                    break;
                case 6:
                    week = "Samedi samedi";
                    week = "Samedi";
                    break;
                case 7:
                    week = "dimanche";
                    week = "Dimanche";
                    break;
            }
        }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/GoogleMap/GoogleMapUtil.java

@@ -193,6 +193,10 @@
        context.shutdown();

        DistanceMatrixElement elements = distanceMatrix.rows[0].elements[0];
        DistanceMatrixElementStatus status = elements.status;
        if(status.compareTo(DistanceMatrixElementStatus.OK) != 0){
            return null;
        }
        DistancematrixVo vo = new DistancematrixVo();
        vo.setDistance(elements.distance.inMeters);
        vo.setDuration(elements.duration.inSeconds);

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/SMSUtil.java

@@ -296,9 +296,10 @@
        System.err.println("短信：" + body);
        JSONObject jsonObject = JSON.parseObject(body);
        Integer status = jsonObject.getInteger("status");
        if(1701 == status){
        if(null != status && 1701 == status){
            return true;
        }else{
            System.err.println("短信发送失败：" + jsonObject.toJSONString());
            return false;
        }
    }

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java

@@ -51,8 +51,8 @@
            driverService.taskMinute();
            //处于预约单
            orderService.reservationOrder();
            //处理车载端断电后的自动下班
            driverService.taskOffWork();
//            //处理车载端断电后的自动下班
//            driverService.taskOffWork();
            //处理结束订单后30分钟解绑小号功能
            orderService.taskMidAxbUnBindSend();
        } catch (Exception e) {

 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/EmailWarpper.java

New file
@@ -0,0 +1,41 @@
package com.stylefeng.guns.modular.system.warpper;

import lombok.Data;

/**
 * <p>
 * 
 * </p>
 *
 * @author administrator
 * @since 2023-09-01
 */
@Data
public class EmailWarpper {

    private static final long serialVersionUID=1L;

    private Integer id;

    /**
     * 用户id
     */
    private Integer userId;

    /**
     * 1用户2司机
     */
    private Integer type;

    /**
     * html 链接
     */
    private String link;
    private Integer orderId;
    private String createTime;
    private String week;
    private String amOrPm;

    private String name;

}

 DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java

@@ -1,5 +1,6 @@
//package com.stylefeng.guns;
//
//import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
//import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;
//import org.junit.Test;
//import org.junit.runner.RunWith;
@@ -20,10 +21,13 @@
//    @Autowired
//    private IOrderEvaluateService orderEvaluateService;
//
//    @Autowired
//    private IOrderLogisticsService orderLogisticsService;
//
//    @Test
//    public void test(){
//        try {
//            Map<String, Object> map = orderEvaluateService.queryEvaluate(3, 1, 10, 2508);
//            orderLogisticsService.sendVerificationCode(3114, 3);
//        }catch (Exception e){
//            e.printStackTrace();
//        }