修改bug和翻译

zhibing.pu

2024-09-02 71a68f675e319967c3078f3f2b86ee971b47b50b

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/UserInfoServiceImpl.java

@@ -34,13 +34,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.RequestBody;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.*;
import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -160,6 +158,11 @@
        return ResultUtil.success();
    }

    
    
    
    
    

    /**
     * 校验短信验证码
@@ -214,7 +217,7 @@

            //用户所属企业
            if(null != lat && null != lng){
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat);
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lat, null);
                AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
                String[] citys = new String[addressComponentsVos.length];
                for (int i = 0; i < addressComponentsVos.length; i++) {
@@ -265,12 +268,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -279,7 +282,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -367,12 +370,12 @@
                        }
                        EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document1.html());
                        //开始生成pdf收据和html收据
                        File file = new File("/usr/local/nginx/html/files/html/");
                        File file = new File("/home/igotechgh/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        String randomString = ToolUtil.getRandomString(10);
                        file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
                        file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                        if(!file.exists()){
                            file.createNewFile();
                        }
@@ -381,7 +384,7 @@
                        fileWriter.flush();
                        fileWriter.close();

                        String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
                        String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(driver.getId());
@@ -495,12 +498,12 @@
                            }
                            EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                            //开始生成pdf收据和html收据
                            File file = new File("/usr/local/nginx/html/files/html/");
                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                            file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                            if(!file.exists()){
                                file.createNewFile();
                            }
@@ -509,7 +512,7 @@
                            fileWriter.flush();
                            fileWriter.close();

                            String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                            String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                            TEmail tEmail = new TEmail();
                            tEmail.setLink(link);
                            tEmail.setUserId(uid);
@@ -615,12 +618,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -629,7 +632,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -724,12 +727,12 @@
                        }
                        EmailUtil.send(driver.getEmail(), language == 1 ? "司机奖励通知" : language == 2 ? "Reward-driver notice" : "Avis de chauffeur de récompense",  document1.html());
                        //开始生成pdf收据和html收据
                        File file = new File("/usr/local/nginx/html/files/html/");
                        File file = new File("/home/igotechgh/nginx/html/files/html/");
                        if(!file.exists()){
                            file.mkdirs();
                        }
                        String randomString = ToolUtil.getRandomString(10);
                        file = new File("/usr/local/nginx/html/files/html/invitation_" + randomString + ".html");
                        file = new File("/home/igotechgh/nginx/html/files/html/invitation_" + randomString + ".html");
                        if(!file.exists()){
                            file.createNewFile();
                        }
@@ -738,7 +741,7 @@
                        fileWriter.flush();
                        fileWriter.close();

                        String link ="http://182.160.16.251:81/files/html/invitation_" + randomString + ".html";
                        String link ="https://igo.i-go.group/files/html/invitation_" + randomString + ".html";
                        TEmail tEmail = new TEmail();
                        tEmail.setLink(link);
                        tEmail.setUserId(driver.getId());
@@ -852,12 +855,12 @@
                            }
                            EmailUtil.send(userInfo1.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                            //开始生成pdf收据和html收据
                            File file = new File("/usr/local/nginx/html/files/html/");
                            File file = new File("/home/igotechgh/nginx/html/files/html/");
                            if(!file.exists()){
                                file.mkdirs();
                            }
                            String randomString = ToolUtil.getRandomString(10);
                            file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                            file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                            if(!file.exists()){
                                file.createNewFile();
                            }
@@ -866,7 +869,7 @@
                            fileWriter.flush();
                            fileWriter.close();

                            String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                            String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                            TEmail tEmail = new TEmail();
                            tEmail.setLink(link);
                            tEmail.setUserId(uid);
@@ -1041,12 +1044,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1055,7 +1058,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -1189,12 +1192,12 @@

                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1203,7 +1206,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(uid);
@@ -1298,7 +1301,7 @@
            }
            //用户所属企业
            if(null != lat && null != lng){
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng);
                ReverseGeocodeVo reverseGeocode = GoogleMapUtil.getReverseGeocode(lat, lng, null);
                if(null != reverseGeocode){
                    AddressComponentsVo[] addressComponentsVos = reverseGeocode.getAddressComponentsVos();
                    String[] citys = new String[addressComponentsVos.length];
@@ -1339,12 +1342,12 @@
                }
                EmailUtil.send(userInfo.getEmail(), language == 1 ? "注册成功" : language == 2 ? "Registered successfully" : "Enregistré avec succès",  document.html());
                //开始生成pdf收据和html收据
                File file = new File("/usr/local/nginx/html/files/html/");
                File file = new File("/home/igotechgh/nginx/html/files/html/");
                if(!file.exists()){
                    file.mkdirs();
                }
                String randomString = ToolUtil.getRandomString(10);
                file = new File("/usr/local/nginx/html/files/html/registration_" + randomString + ".html");
                file = new File("/home/igotechgh/nginx/html/files/html/registration_" + randomString + ".html");
                if(!file.exists()){
                    file.createNewFile();
                }
@@ -1353,7 +1356,7 @@
                fileWriter.flush();
                fileWriter.close();

                String link ="http://182.160.16.251:81/files/html/registration_" + randomString + ".html";
                String link ="https://igo.i-go.group/files/html/registration_" + randomString + ".html";
                TEmail tEmail = new TEmail();
                tEmail.setLink(link);
                tEmail.setUserId(uid);
@@ -1484,12 +1487,12 @@
                    }
                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -1498,7 +1501,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(uid);
@@ -1692,6 +1695,9 @@
    @Override
    public Map<String, Object> queryUser(Integer language, String phone) throws Exception {
        Map<String, Object> map = userInfoMapper.queryUserInfo(null, phone);
        if(null == map){
            return null;
        }
        if(null != map.get("birthday")){
            String birthday = map.get("birthday").toString();
            map.put("birthday", DateUtil.conversionFormat(language, birthday));
@@ -1743,8 +1749,8 @@
            checkoutRequest.setRequestDescription("Account top-up");
            checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance");
            checkoutRequest.setPendingRedirectUrl("");
            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
            return TinggPayUtil.checkoutRequest(checkoutRequest);
        }

@@ -1764,8 +1770,8 @@
            checkoutRequest.setRequestDescription("Account top-up");
            checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelUserBalance");
            checkoutRequest.setPendingRedirectUrl("");
            checkoutRequest.setSuccessRedirectUrl("http://182.160.16.251:81/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("http://182.160.16.251:81/payMoney/pages/fail.html");
            checkoutRequest.setSuccessRedirectUrl("https://igo.i-go.group/payMoney/pages/success.html");
            checkoutRequest.setFailRedirectUrl("https://igo.i-go.group/payMoney/pages/fail.html");
            return TinggPayUtil.checkoutRequest(checkoutRequest);
        }
        return ResultUtil.success("");
@@ -1838,12 +1844,12 @@

            EmailUtil.send(userInfo.getEmail(), language == 1 ? "重置密码" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe",  document.html());
            //开始生成pdf收据和html收据
            File file = new File("/usr/local/nginx/html/files/html/");
            File file = new File("/home/igotechgh/nginx/html/files/html/");
            if(!file.exists()){
                file.mkdirs();
            }
            String randomString = ToolUtil.getRandomString(10);
            file = new File("/usr/local/nginx/html/files/html/password_" + randomString + ".html");
            file = new File("/home/igotechgh/nginx/html/files/html/password_" + randomString + ".html");
            if(!file.exists()){
                file.createNewFile();
            }
@@ -1852,7 +1858,7 @@
            fileWriter.flush();
            fileWriter.close();

            String link ="http://182.160.16.251:81/files/html/password_" + randomString + ".html";
            String link ="https://igo.i-go.group/files/html/password_" + randomString + ".html";
            TEmail tEmail = new TEmail();
            tEmail.setLink(link);
            tEmail.setUserId(uid);
@@ -1939,7 +1945,7 @@
        UserInfo userInfo = this.selectById(query.getUserId());
        if(null != query){
            //添加交易明细
            transactionDetailsService.saveData(Integer.valueOf(query.getUserId()), "余额充值", query.getAmount(), 2, 1, 1, 5, null);
            transactionDetailsService.saveData(Integer.valueOf(query.getUserId()), "余额充值", query.getAmount(), 2, 1, 1, 5, paymentRecordId);
            double v = new BigDecimal(userInfo.getBalance()).add(new BigDecimal(query.getAmount())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
            userInfo.setBalance(v);
            this.updateById(userInfo);
@@ -1975,13 +1981,9 @@
            String endTime = "";
            if(null != map.get("startTime")){
                startTime = map.get("startTime").toString();
                map.put("startTime", DateUtil.conversionFormat(language, startTime));
                startTime = DateUtil.conversionFormat(language, startTime);
            }
            if(null != map.get("endTime")){
                endTime = map.get("endTime").toString();
                map.put("endTime", DateUtil.conversionFormat(language, endTime));
                endTime = DateUtil.conversionFormat(language, endTime);
            }
            double fullMoney = 0;
            if(null != map.get("bcompanyId")){
@@ -2156,12 +2158,12 @@
                    }
                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -2170,7 +2172,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(userInfo.getId());
@@ -2323,12 +2325,12 @@
                    }
                    EmailUtil.send(userInfo.getEmail(), language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé sur le compte",  document1.html());
                    //开始生成pdf收据和html收据
                    File file = new File("/usr/local/nginx/html/files/html/");
                    File file = new File("/home/igotechgh/nginx/html/files/html/");
                    if(!file.exists()){
                        file.mkdirs();
                    }
                    String randomString = ToolUtil.getRandomString(10);
                    file = new File("/usr/local/nginx/html/files/html/coupon_" + randomString + ".html");
                    file = new File("/home/igotechgh/nginx/html/files/html/coupon_" + randomString + ".html");
                    if(!file.exists()){
                        file.createNewFile();
                    }
@@ -2337,7 +2339,7 @@
                    fileWriter.flush();
                    fileWriter.close();

                    String link ="http://182.160.16.251:81/files/html/coupon_" + randomString + ".html";
                    String link ="https://igo.i-go.group/files/html/coupon_" + randomString + ".html";
                    TEmail tEmail = new TEmail();
                    tEmail.setLink(link);
                    tEmail.setUserId(userInfo.getId());