修改bug

Pu Zhibing

2025-04-02 e1940dda45fa066d994cc5cf0e34c7f97d9e7b2d

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

@@ -338,6 +338,7 @@
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistory.setCompletionTime(new Date());
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -521,12 +522,13 @@
            if(type == 2){
                driver = driverMapper.selectById(uid);
                Map<String, Date> date = dateUtil.getStartAndEndDate(new Date());
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(null, 1, 1, date.get("startTime"), date.get("endTime"));
                List<DriverActivityHistory> list = driverActivityHistoryMapper.queryList(uid, 1, 1, date.get("startTime"), date.get("endTime"));
                BigDecimal bigDecimal = new BigDecimal("0");
                for (DriverActivityHistory driverActivityHistory : list) {
                    bigDecimal = bigDecimal.add(new BigDecimal(driverActivityHistory.getMoney()));
                    incomeService.saveData(2, driver.getId(), 1, driverActivityHistory.getId(), null, driverActivityHistory.getMoney());
                    driverActivityHistory.setCarryOut(2);
                    driverActivityHistory.setCompletionTime(new Date());
                    driverActivityHistoryMapper.updateById(driverActivityHistory);
                }
                driver.setActivityMoney(bigDecimal.add(new BigDecimal(driver.getActivityMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -535,6 +537,12 @@
                driverMapper.updateById(driver);

                if(ToolUtil.isNotEmpty(driver.getEmail())){
                    Driver finalDriver = driver;
                    BigDecimal finalBigDecimal = bigDecimal;
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                    String path = templatePath + "driver/index.html";
                    Document document = Jsoup.parse(new File(path), "UTF-8");
                    if(1 == language){
@@ -552,9 +560,9 @@

                        document.getElementsByTag("title").get(0).text("司机奖励通知");
                        Element invite_user = document.getElementById("invite_user");
                        invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    invite_user.text("您好 " + finalDriver.getFirstName() + "" + finalDriver.getLastName() + "，");
                        Element invite_content = document.getElementById("invite_content");
                        invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + bigDecimal.doubleValue() + "，请查收");
                                    invite_content.text("您已成功邀请一位司机注册I-GO，获得奖励GHS " + finalBigDecimal.doubleValue() + "，请查收");
                    }
                    if(2 == language){
                        document.getElementById("chinese").remove();
@@ -571,9 +579,9 @@

                        document.getElementsByTag("title").get(0).text("Reward-driver notice");
                        Element invite1_user = document.getElementById("invite1_user");
                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");
                                    invite1_user.text("Hello " + finalDriver.getFirstName() + "" + finalDriver.getLastName() + "，");
                        Element invite1_content = document.getElementById("invite1_content");
                        invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + bigDecimal.doubleValue() + " bonus, please check your balance.");
                                    invite1_content.text("You have succeeded to invite a driver to register with I-GO, so you received a GHS " + finalBigDecimal.doubleValue() + " bonus, please check your balance.");
                    }
                    if(3 == language){
                        document.getElementById("chinese").remove();
@@ -590,11 +598,11 @@

                        document.getElementsByTag("title").get(0).text("Avis de chauffeur de récompense");
                        Element invite2_user = document.getElementById("invite2_user");
                        invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.getLastName() + "，");
                                    invite2_user.text("Bonjour " + finalDriver.getFirstName() + " " + finalDriver.getLastName() + "，");
                        Element invite2_content = document.getElementById("invite2_content");
                        invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + bigDecimal.doubleValue() + ". Veuillez vérifier");
                                    invite2_content.text("Vous avez invité avec succès un conducteur à s’inscrire à i-go pour recevoir une récompense GHS " + finalBigDecimal.doubleValue() + ". Veuillez vérifier");
                    }
                    EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
                                EmailUtil.send(finalDriver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document.html());
                    String randomString = ToolUtil.getRandomString(10);
                    //开始生成pdf收据和html收据
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
@@ -613,7 +621,7 @@
                    String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(driver.getId());
                                tEmail.setUserId(finalDriver.getId());
                    tEmail.setType(2);
                    tEmail.setName(language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense");
                    tEmail.setCreateTime(new Date());
@@ -627,6 +635,11 @@
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }

            }
@@ -2527,6 +2540,7 @@
            List<DriverOnline> driverOnlines = driverOnlineMapper.queryList(sdf.format(new Date()), null, dah.getDriverId(), duration);
            if(driverOnlines.size() > 0){
                dah.setCarryOut(2);//完成状态
                dah.setCompletionTime(new Date());
                driverActivityHistoryMapper.updateById(dah);
    
                redisUtil.remove("driverActivity_" + dah.getDriverId() + "_" + dah.getId());
@@ -2546,6 +2560,10 @@
    
                Integer language = driver.getLanguage();
                if(ToolUtil.isNotEmpty(driver.getEmail())) {
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                    String path1 = templatePath + "driver/index.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if (1 == language) {
@@ -2638,6 +2656,11 @@
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }
            }
        }
@@ -2649,6 +2672,7 @@
            Integer integer = orderService.queryOrderNum(dah.getDriverId(), date.get("startTime"), date.get("endTime"));
            if(dao.getOrderNum() <= integer){
                dah.setCarryOut(2);//完成状态
                dah.setCompletionTime(new Date());
                driverActivityHistoryMapper.updateById(dah);
                //修改余额
                Driver driver = this.selectById(dah.getDriverId());
@@ -2665,6 +2689,10 @@
    
                Integer language = driver.getLanguage();
                if(ToolUtil.isNotEmpty(driver.getEmail())) {
                    new Thread(new Runnable() {
                        @Override
                        public void run() {
                            try {
                    String path1 = templatePath + "driver/index.html";
                    Document document1 = Jsoup.parse(new File(path1), "UTF-8");
                    if (1 == language) {
@@ -2758,6 +2786,11 @@
                        tEmail.setAmOrPm(language==1?"下午":language==2?"afternoon":"après-midi");
                    }
                    emailService.insert(tEmail);
                            }catch (Exception e){
                                e.printStackTrace();
                            }
                        }
                    }).start();
                }
            }
        }