提交1.0版本

zhibing.pu

2024-04-10 1ae4441cd5bab107d0eec55817e07129fdc84297

提交1.0版本

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

@@ -81,8 +81,8 @@
    public ResultUtil<DriverInfoWarpper> queryDriverInfo(Integer id, Integer language){
        try {
            Map<String, Object> map = driverService.queryDriverInfo(id);
            String name = String.valueOf(map.get("name"));
            map.put("name", name.substring(0, 1) + (language == 1 ? "师傅" : language == 2 ? "driver" : "Le conducteur"));
//            String name = String.valueOf(map.get("name"));
//            map.put("name", name.substring(0, 1) + (language == 1 ? "师傅" : language == 2 ? "driver" : "Le conducteur"));
            List<BaseWarpper> list = driverService.queryBusiness(id, language);
            map.put("list", list);
            return ResultUtil.success(DriverInfoWarpper.getDriverInfoWarpper(map));

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java

@@ -461,14 +461,14 @@
                map.put("driverPhone", map.get("telX"));
            }
            OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
            String driverName = orderInfoWarpper.getDriverName();
            if(language == 2){
                driverName = "Master " + driverName.replace("师傅", "");
            }
            if(language == 3){
                driverName = "Maître " + driverName.replace("师傅", "");
            }
            orderInfoWarpper.setDriverName(driverName);
//            String driverName = orderInfoWarpper.getDriverName();
//            if(language == 2){
//                driverName = "Master " + driverName.replace("师傅", "");
//            }
//            if(language == 3){
//                driverName = "Maître " + driverName.replace("师傅", "");
//            }
//            orderInfoWarpper.setDriverName(driverName);

            File file = new File(filePath + orderId + "_1.txt");
            if(file.exists()){
@@ -529,14 +529,14 @@
                map.put("driverPhone", map.get("telX"));
            }
            OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
            String driverName = orderInfoWarpper.getDriverName();
            if(language == 2){
                driverName = "Master " + driverName.replace("师傅", "");
            }
            if(language == 3){
                driverName = "Maître " + driverName.replace("师傅", "");
            }
            orderInfoWarpper.setDriverName(driverName);
//            String driverName = orderInfoWarpper.getDriverName();
//            if(language == 2){
//                driverName = "Master " + driverName.replace("师傅", "");
//            }
//            if(language == 3){
//                driverName = "Maître " + driverName.replace("师傅", "");
//            }
//            orderInfoWarpper.setDriverName(driverName);
            return ResultUtil.success(orderInfoWarpper);
        }catch (Exception e){
            e.printStackTrace();
@@ -582,14 +582,14 @@
                    break;
            }
            OrderInfoWarpper orderInfoWarpper = OrderInfoWarpper.getOrderInfoWarpper(map);
            String driverName = orderInfoWarpper.getDriverName();
            if(language == 2){
                driverName = "Master " + driverName.replace("师傅", "");
            }
            if(language == 3){
                driverName = "Maître " + driverName.replace("师傅", "");
            }
            orderInfoWarpper.setDriverName(driverName);
//            String driverName = orderInfoWarpper.getDriverName();
//            if(language == 2){
//                driverName = "Master " + driverName.replace("师傅", "");
//            }
//            if(language == 3){
//                driverName = "Maître " + driverName.replace("师傅", "");
//            }
//            orderInfoWarpper.setDriverName(driverName);
            return ResultUtil.success(orderInfoWarpper);
        }catch (Exception e){
            e.printStackTrace();

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/LineSiteMapper.xml

@@ -21,7 +21,7 @@
        b.driverId as driverId,
        a.startTime as startTime,
        c.headImgUrl as headImgUrl,
        CONCAT(left(c.`name`, 1), '师傅') as `name`,
        c.`name` as `name`,
        d.carLicensePlate as carLicensePlate,
        CONCAT(e.`name`, f.`name`) as brand,
        d.carColor as carColor,

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/dao/mapping/OrderCrossCityMapper.xml

@@ -324,7 +324,7 @@
        CONCAT(b.firstName, " ", b.lastName) as driverName,
        c.carLicensePlate as licensePlate,
        c.carColor as carColor,
        CONCAT(f.`name`, d.`name`) as brand,
        CONCAT(f.`name`, " ", d.`name`) as brand,
        ((select sum(fraction) from t_order_evaluate where driverId = a.driverId) / (select count(id) from t_order_evaluate where driverId = a.driverId)) as score,
        (
        (select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/dao/mapping/OrderPrivateCarMapper.xml

@@ -422,7 +422,7 @@
        CONCAT(b.firstName, " ", b.lastName) as driverName,
        c.carLicensePlate as licensePlate,
        c.carColor as carColor,
        CONCAT(f.`name`, d.`name`) as brand,
        CONCAT(f.`name`, " ", d.`name`) as brand,
        ((select sum(fraction) from t_order_evaluate where driverId = a.driverId) / (select count(id) from t_order_evaluate where driverId = a.driverId)) as score,
        (
        (select count(id) from t_order_private_car where driverId = a.driverId and state in (7, 8, 9)) +

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

@@ -321,13 +321,8 @@
            if(query.size() == 0){
                return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }

            int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
            int count = settlementRecordService.selectCount(new EntityWrapper<SettlementRecord>().eq("driverId", driverId).eq("paymentStatus", 1));
            if(count > 0){
                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }
            int count1 = orderLogisticsService.selectCount(new EntityWrapper<OrderLogistics>().eq("driverId", driverId).eq("driverPay", 1).ne("state", 10).eq("isDelete", 1));
            if(count1 > 0){
                return ResultUtil.error(language == 1 ? "司机未支付订单费用，无法进行接单" : language == 2 ? "Driver has outstanding fees to pay, unable to receive orders." : "Le chauffeur a des frais impayés à payer, incapable de recevoir des commandes.");
            }

@@ -903,7 +898,7 @@
        UserCouponRecord userCouponRecord = null;
        if(null != couponId){
            userCouponRecord = userCouponRecordService.selectById(couponId);
            if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
            if(!userCouponRecord.getCompanyId().equals(orderPrivateCar.getCompanyId())){
                return ResultUtil.error(language == 1 ? "优惠券不能用于此订单" : language == 2 ? "Coupon cannot be used for this order." : "Le coupon ne peut pas être utilisé pour cette commande.", "");
            }
            if(userCouponRecord.getState() == 2){
@@ -1060,24 +1055,24 @@
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -1099,7 +1094,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1126,24 +1121,24 @@
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -1165,7 +1160,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1192,24 +1187,24 @@
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -1231,7 +1226,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -1474,24 +1469,24 @@
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -1513,7 +1508,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -1540,24 +1535,24 @@
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -1579,7 +1574,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -1606,24 +1601,24 @@
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -1645,7 +1640,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());
@@ -2041,24 +2036,24 @@
                                Element title_chinese = document.getElementById("title_chinese");
                                title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，您在I-GO此订单消费GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
                                Element xcf_chinese = document.getElementById("xcf_chinese");
                                xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_chinese.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_chinese = document.getElementById("yhq_chinese");
                                    yhq_chinese.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_chinese_div = document.getElementById("yhq_chinese_div");
                                    yhq_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_chinese = document.getElementById("zk_chinese");
                                    zk_chinese.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_chinese_div = document.getElementById("zk_chinese_div");
                                    zk_chinese_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_chinese = document.getElementById("hb_chinese");
                                    hb_chinese.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_chinese.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_chinese_div = document.getElementById("hb_chinese_div");
                                    hb_chinese_div.remove();
@@ -2080,7 +2075,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_chinese = document.getElementById("cp_chinese");
                                cp_chinese.text("车牌：" + car.getCarLicensePlate());
@@ -2107,24 +2102,24 @@
                                Element title_english = document.getElementById("title_english");
                                title_english.text(DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + "，You spent GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " on the trip ");
                                Element xcf_english = document.getElementById("xcf_english");
                                xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_english.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_english = document.getElementById("yhq_english");
                                    yhq_english.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_english.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_english_div = document.getElementById("yhq_english_div");
                                    yhq_english_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_english = document.getElementById("zk_english");
                                    zk_english.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_english.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_english_div = document.getElementById("zk_english_div");
                                    zk_english_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_english = document.getElementById("hb_english");
                                    hb_english.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_english.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_english_div = document.getElementById("hb_english_div");
                                    hb_english_div.remove();
@@ -2146,7 +2141,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_english = document.getElementById("cp_english");
                                cp_english.text("Number Plate：" + car.getCarLicensePlate());
@@ -2173,24 +2168,24 @@
                                Element title_french = document.getElementById("title_french");
                                title_french.text("Le " + DateUtil.conversionFormat(language, sdf.format(orderPrivateCar.getTravelTime())) + ", vous avez dépensé GHS " + new BigDecimal(orderPrivateCar.getPayMoney()).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue() + " sur le voyage");
                                Element xcf_french = document.getElementById("xcf_french");
                                xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
                                xcf_french.text("GHS " + new BigDecimal(orderPrivateCar.getOrderMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                if(null != orderPrivateCar.getCouponMoney() && orderPrivateCar.getCouponMoney() > 0){
                                    Element yhq_french = document.getElementById("yhq_french");
                                    yhq_french.text("GHS -" + orderPrivateCar.getCouponMoney());
                                    yhq_french.text("GHS -" + new BigDecimal(orderPrivateCar.getCouponMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element yhq_french_div = document.getElementById("yhq_french_div");
                                    yhq_french_div.remove();
                                }
                                if(null != orderPrivateCar.getDiscountMoney() && orderPrivateCar.getDiscountMoney() > 0){
                                    Element zk_french = document.getElementById("zk_french");
                                    zk_french.text("GHS -" + orderPrivateCar.getDiscountMoney());
                                    zk_french.text("GHS -" + new BigDecimal(orderPrivateCar.getDiscountMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element zk_french_div = document.getElementById("zk_french_div");
                                    zk_french_div.remove();
                                }
                                if(null != orderPrivateCar.getRedPacketMoney() && orderPrivateCar.getRedPacketMoney() > 0){
                                    Element hb_french = document.getElementById("hb_french");
                                    hb_french.text("GHS -" + orderPrivateCar.getRedPacketMoney());
                                    hb_french.text("GHS -" + new BigDecimal(orderPrivateCar.getRedPacketMoney()).setScale(2, RoundingMode.HALF_EVEN));
                                }else{
                                    Element hb_french_div = document.getElementById("hb_french_div");
                                    hb_french_div.remove();
@@ -2212,7 +2207,7 @@
                                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.text(" " + driver.getFirstName() + "." + driver.getLastName());
                                }
                                Element cp_french = document.getElementById("cp_french");
                                cp_french.text("Plaque: GS " + car.getCarLicensePlate());

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/DriverMapper.xml

@@ -325,7 +325,7 @@
        a.idCard as idcode,
        b.carLicensePlate as licensePlate,
        b.carColor as carColor,
        CONCAT(d.`name`, c.`name`) as brand,
        CONCAT(d.`name`, " ", c.`name`) as brand,
        if((select count(id) from t_driver_work where state = 1 and driverId = a.id) = 0, 1, if(
        (
        (select count(id) from t_order_private_car where state not in (6, 7, 8, 9, 10, 12) and driverId = a.id) +

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

@@ -305,5 +305,8 @@
        }
    }


    public static void main(String[] ages){
        SMSUtil smsUtil = new SMSUtil();
        smsUtil.sendCellulantMessage("233244915521", "您的验证码为：123456，该验证码5分钟内有效，请勿泄漏于他人！");
    }
}

 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/OrderInfoWarpper.java

@@ -746,7 +746,7 @@
            orderInfoWarpper.setEndAddress(null != map.get("endAddress") ? String.valueOf(map.get("endAddress")) : "");
            orderInfoWarpper.setDriverId(null != map.get("driverId") ? Integer.valueOf(String.valueOf(map.get("driverId"))) : 0);
            orderInfoWarpper.setDriverAvatar(null != map.get("driverAvatar") ? String.valueOf(map.get("driverAvatar")) : "");
            orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")).substring(0, 1) + "师傅" : "");
            orderInfoWarpper.setDriverName(null != map.get("driverName") ? String.valueOf(map.get("driverName")) : "");
            orderInfoWarpper.setLicensePlate(null != map.get("licensePlate") ? String.valueOf(map.get("licensePlate")) : "");
            orderInfoWarpper.setBrand(null != map.get("brand") ? String.valueOf(map.get("brand")) : "");
            orderInfoWarpper.setScore(null != map.get("score") ? Double.valueOf(String.valueOf(map.get("score"))) : 0);

 UserIGOTravel/guns-admin/src/main/resources/application.yml

@@ -1,146 +1,3 @@
server:
  port: 8006

guns:
  swagger-open: true              #是否开启swagger (true/false)
  kaptcha-open: false             #是否开启登录时验证码 (true/false)
#  file-upload-path: d:/tmp       #文件上传目录(不配置的话为java.io.tmpdir目录)
  spring-session-open: false      #是否开启spring session,如果是多机环境需要开启(true/false)
  session-invalidate-time: 1800     #session失效时间(只在单机环境下生效，多机环境在SpringSessionConfig类中配置) 单位：秒
  session-validation-interval: 900  #多久检测一次失效的session(只在单机环境下生效) 单位：秒

spring:
  application:
    name: user-server
  profiles:
#    active: dev
    active: produce
  mvc:
    static-path-pattern: /static/**
    view:
      prefix: /WEB-INF/view
  devtools:
    restart:
      enabled: false
      additional-paths: src/main/java
      exclude: static/**,WEB-INF/view/**
  servlet:
    multipart:
      max-request-size: 100MB
      max-file-size: 100MB

mybatis-plus:
  typeAliasesPackage: com.stylefeng.guns.modular
  configuration:
    log-impl: org.apache.ibatis.logging.slf4j.Slf4jImpl


eureka:
  client:
    service-url: #注册中心地址
      defaultZone: http://sinata:sinata@127.0.0.1:8000/eureka #启用身份验证的方式连接
    register-with-eureka: true #在注册中心进行注册
    fetch-registry: true #从Eureka中获取注册信息。

---


#配置Swagger接口扫描范围
swagger:
  base-package: com.stylefeng.guns.modular


spring:
  datasource:
    url: jdbc:mysql://127.0.0.1:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0
    username: root
    password: HjKbXilb9zajmXbl
    db-name: guns #用来搜集数据库的所有表
    filters: wall,mergeStat


################# 测试环境 ###################
#spring:
#  datasource:
#    url: jdbc:mysql://192.168.110.80:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
#    username: root
#    password: 123456
#    db-name: guns #用来搜集数据库的所有表
#    filters: wall,mergeStat2

#多数据源情况的配置
guns:
  muti-datasource:
    open: false
    url: jdbc:mysql://127.0.0.1:3306/guns_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=Asia/Shanghai
    username: root
    password: root
    dataSourceNames:
      - dataSourceGuns
      - dataSourceBiz

---


wx:
  grantType: authorization_code #填authorization_code
  #appletsAppid: wx36c966d381cd5d62 #应用唯一标识，在微信开放平台提交应用审核通过后获得
  #appletsAppSecret: cf4b21c7175356f41fa3c426f26c20e4 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appletsAppid: wx94a1a55229c933ac #应用唯一标识，在微信开放平台提交应用审核通过后获得
  appletsAppSecret: cbd89baf017146c1d56c00f1d2a59df6 #应用密钥AppSecret，在微信开放平台提交应用审核通过后获得
  appid: wx94a1a55229c933ac #小程序APPid
  appSecret: cbd89baf017146c1d56c00f1d2a59df6 #
  mchId: 1550090851 #微信支付分配的商户号
  key: JnhREmZwHNKyFUQPEhijp1gdaCUzKg8P #key为商户平台设置的密钥key：

---

alipay:
  appid: 2019080866147541  #应用程序唯一标识
  appPrivateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC+YuDPSRwDgk317Wp0xrMHfVr2gL/us4ue7REAP3vBT5qNGtl3EB3OycocTH2m3Y1rUhzrkkOWqG93iYb2Au11l8Q9jwv/lzyn6uQ/iiBwy5acet/5PxeKHeFytyjVrMFPNKEa1pOF5M7T5aMYTavR8xISTMiZ1ZerCOom9uPS8LT2aDP7GRUdsnJN9u6c1yIixQOpkI8FB62bSpQJvo7BP7CSm1+fa1upXoVWYWsnaDsa23TojaBR/T7ISf3Jpj6/ZSJtXoFa+CupKF6ghq85Mh3b17bClMuQ9oz7+OZq3neRfy4DEZhpo3NOX4oRH9x3xDnaTE7ZhiJTZJZUlsKFAgMBAAECggEBAKjxvWS0D7PdcakGIS23FS9UQd/0qFz93qwM2sVJkFwec5s7dDZ/irPxxPQPvIDSoafWmetBQ9Dxbti4pZaxSl7LakzmH1OTtTOc8SahP+BYCTKapx3aqtzZXzIY7peOUYwju8LBHu/19sN6R5xNcGdCN4sdr/Uy4P/ZTU9+TvTjMo5IUbomiGSt169eypy2yFXr1Ydtq0lS70ZnwCcnVlvjAI/AYRT2qOYVrBGlWs8qsoEMjRL1Cocq4lhXu1f9pw+z2FDw86Kj/nNL7oX3YS42ebGzB56CEYDnydcjZ8KMDnqGrwYjBLpulWL53x6q4d8Ht8l7yTMC/vnM46QgNAECgYEA95I8lUNWa2aTi7kyHQ9FYsdARcISnEFXypHKNiNgVmOYD5AxxIOvpz09B1tRJV2+ouiL81WnqhnRzc4pUwLeMiqJCgzAZjQsMvMAy6QMlCqintGahOhcS36L6PKU0fND/vMGWU+TPOpWkaB22zUeUI8nyJpzApscvdbhsDrhrcUCgYEAxN47kpe/jYLVUOjMzcT+GfJUJYwO4kUzSpUwQfGInPZzDM9YgUoT//BjsCF6QIVNZITKK6HbCdVmuFzPbQ/0g1cYqoBOW5SQxO4aCxkv23fSUXzhXTs29+XK7QIYh5iZ67pAg6YVxaF66MA06mgaQ/josH3LhEbzW81d84fczcECgYBJYxUIXgypC6AjJAPB73vu+weHZi8kGI6QosThZX0yPpWdz22hRjP0jEeh/aTBQde37N1HhZWM69hwfHNtgwUgs9EppHwID+EmPTh4JSoBZd4M3C9ExKhPTLTmmboZvlXipmG0ac1ImmKNCpcRBd71nGn7oiUDmb1cXO1L0ziAzQKBgBo6LR+Tfd6Bbp/P0/EZ7GxSf2ldJmJ4q6OlCn/OiM+4eY1cVkMrNkzjnrRJUXslBzF8C18SuhauSngHTU8PUBjrUorsewPyX/MMcYXG/jwz014tz+xWxjTydT1sCQ6PgvoHny6qwr3IjJJTgPk1k0I49+8DY0ilFyjEzF50XDNBAoGBAPBKfcwVzCnlch+BAeI3ovuGrnpdbTA01wvuyfE+IdTISY7KuI5JrbRx9SpkC+IPN/n9nHA6Ru0BmnM9QP4daN9P0VXKWKidXzgoKTt48U2/QNHwY/srciXRI6EdsRSY14KqMIFi0S5iRRzi8MztKYy2fDElTbwN8eHENmPxTy94 #开发者应用私钥
  alipayPublicKey: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvmLgz0kcA4JN9e1qdMazB31a9oC/7rOLnu0RAD97wU+ajRrZdxAdzsnKHEx9pt2Na1Ic65JDlqhvd4mG9gLtdZfEPY8L/5c8p+rkP4ogcMuWnHrf+T8Xih3hcrco1azBTzShGtaTheTO0+WjGE2r0fMSEkzImdWXqwjqJvbj0vC09mgz+xkVHbJyTfbunNciIsUDqZCPBQetm0qUCb6OwT+wkptfn2tbqV6FVmFrJ2g7Gtt06I2gUf0+yEn9yaY+v2UibV6BWvgrqSheoIavOTId29e2wpTLkPaM+/jmat53kX8uAxGYaaNzTl+KER/cd8Q52kxO2YYiU2SWVJbChQIDAQAB #应用公钥
  alipay_public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtXGGldcA52Hbp1rUh1gCrq+Bv64rZonpIzUsvIK1j7TC2nYVSMz5zAo/JI4YDKQNuEP2rK74+c/eZUaSdqjI40rh+UT6Wkc7KArVq6AUXZCm3pUomFK7aEDG93QwB8YSmBn4tAghUxI3OR1k6UKVg5qO373F3EXLYcdOMcVkmYe/N4LxbLE/qSekyujXflKuPDAmva2KLZ7Y0iz3efXyzmQeZ7TGebgpSwABBjxDPIQz8/uW1zv84nslzOiAOOFNV8jBOqYs4PfyqPxl34rHrY8IyuI4SBH7zfHwqG42TY1i298Dz7YaNz0i0UGu80SCdQeakIG0u8uypvDQ9h7eywIDAQAB #支付宝公钥

---

---
#脸书
facebook:
  appid:
  secretKey:

---

juhe: #聚合数据
  appKey: c0d55e1fb67efd7ae3175ee9bd8c6bc2 #


---

filePath: /usr/local/server/orderPostionFile/ #存储订单轨迹文件路径
#filePath: C:/orderPostionFile/  #存储订单轨迹文件路径

#支付回调地址
#正式环境
#callbackPath: https://okyueche.com:443/user
#测试环境
callbackPath: http://182.160.16.251/user

---

spring:
  mail:
    host: smtp.gmail.com # 配置 smtp 服务器地址
    port: 465 # smtp 服务器的端口
    username: i-gotech@i-go.group # 配置邮箱用户名(你的邮箱地址)
    password: mhizkqkhuknbitps # 配置申请到的授权码(刚让复制的授权码)
    default-encoding: UTF-8 # 配置邮件编码
    properties:
      mail:
        smtp:
          socketFactoryClass: javax.net.ssl.SSLSocketFactory # 配饰 SSL 加密工厂
        debug: true
    from: i-gotech@i-go.group # 发送方邮件，配在yml中可方便更改
    template-path: /usr/local/nginx/html/mailbox/

---
    active: @spring.active@

 UserIGOTravel/guns-admin/src/main/resources/logback-spring.xml

@@ -194,11 +194,11 @@
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.stylefeng.guns.modular.system.dao" level="debug"/>
        <logger name="business-log" level="warn"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
        <logger name="business-log" level="info"/>
    </springProfile>

    <springProfile name="fat">
    <springProfile name="test">
        <root level="info">
            <appender-ref ref="CONSOLE" />
            <appender-ref ref="DEBUG_FILE" />
@@ -207,8 +207,8 @@
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.stylefeng.guns.modular.system.dao" level="debug"/>
        <logger name="business-log" level="warn"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="info"/>
        <logger name="business-log" level="info"/>
    </springProfile>

    <springProfile name="produce">
@@ -220,7 +220,7 @@
            <appender-ref ref="ERROR_FILE" />
            <appender-ref ref="ALL_FILE" />
        </root>
        <logger name="com.stylefeng.guns.modular.system.dao" level="debug"/>
        <logger name="com.stylefeng.guns.modular.system.dao" level="error"/>
        <logger name="business-log" level="warn"/>
    </springProfile>


 UserIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/TestGunsApplication.java

@@ -32,7 +32,6 @@
//
//    @Test
//    public void test(){
//        PayoutResponse payoutResponse = tinggPayoutUtil.sendPayout("GH-VODAFONE-B2C", "+233500666666", "123465", 1.00d, "", "测试转账");
//        System.err.println(JSON.toJSONString(payoutResponse));
//        smsUtil.sendCellulantMessage("233203716998", "您的验证码为：123456，该验证码5分钟内有效，请勿泄漏于他人！");
//    }
//}

 UserIGOTravel/guns-core/src/main/resources/default-config.properties

@@ -21,8 +21,6 @@
mybatis-plus.configuration.lazyLoadingEnabled=true
# \u5F00\u542F\u7684\u8BDD\uFF0C\u5EF6\u65F6\u52A0\u8F7D\u4E00\u4E2A\u5C5E\u6027\u65F6\u4F1A\u52A0\u8F7D\u8BE5\u5BF9\u8C61\u5168\u90E8\u5C5E\u6027\uFF0C\u5426\u5219\u6309\u9700\u52A0\u8F7D\u5C5E\u6027
mybatis-plus.configuration.multipleResultSetsEnabled=true
# \u6253\u5370sql\u8BED\u53E5,\u8C03\u8BD5\u7528
mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl


########################## beetl\u9ED8\u8BA4\u914D\u7F6E ###########################