parent: 51a97378 | 补丁 | 提交 | ignore whitespace
puzhibing
2023-12-13 af6d43a41205f8c7fc1a965cb019c039063bf4f0 
更新接口
5个文件已修改
137 ■■■■■ 已修改文件
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/WithdrawalServiceImpl.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DriverIGOTravel/guns-admin/src/test/java/com/stylefeng/guns/GunsApplicationTest.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java


@@ -218,6 +218,7 @@


                        if(1 == language){


                            document.getElementById("english").remove();


                            document.getElementById("french").remove();


                            document.getElementsByTag("title").get(0).text("包裹收据");


                            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");


@@ -252,6 +253,7 @@


                        if(2 == language){


                            document.getElementById("chinese").remove();


                            document.getElementById("french").remove();


                            document.getElementsByTag("title").get(0).text("Package 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");


@@ -286,6 +288,7 @@


                        if(3 == language){


                            document.getElementById("chinese").remove();


                            document.getElementById("english").remove();


                            document.getElementsByTag("title").get(0).text("Reçu de colis");


                            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");


@@ -484,6 +487,7 @@


                    if(1 == language){


                        document.getElementById("english").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("包裹收据");


                        Element title_chinese = document.getElementById("title_chinese");


                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());


                        Element xcf_chinese = document.getElementById("xcf_chinese");


@@ -518,6 +522,7 @@


                    if(2 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("Package receipt");


                        Element title_english = document.getElementById("title_english");


                        title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");


                        Element xcf_english = document.getElementById("xcf_english");


@@ -552,6 +557,7 @@


                    if(3 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("english").remove();


                        document.getElementsByTag("title").get(0).text("Reçu de colis");


                        Element title_french = document.getElementById("title_french");


                        title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");


                        Element xcf_french = document.getElementById("xcf_french");


@@ -642,6 +648,7 @@


                    if(1 == language){


                        document.getElementById("english").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("包裹收据");


                        Element title_chinese = document.getElementById("title_chinese");


                        title_chinese.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney());


                        Element xcf_chinese = document.getElementById("xcf_chinese");


@@ -676,6 +683,7 @@


                    if(2 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("Package receipt");


                        Element title_english = document.getElementById("title_english");


                        title_english.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，You spent GHS " + orderLogistics.getPayMoney() + " on the trip ");


                        Element xcf_english = document.getElementById("xcf_english");


@@ -710,6 +718,7 @@


                    if(3 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("english").remove();


                        document.getElementsByTag("title").get(0).text("Reçu de colis");


                        Element title_french = document.getElementById("title_french");


                        title_french.text(DateUtil.conversionFormat(language, sdf.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");


                        Element xcf_french = document.getElementById("xcf_french");


@@ -800,6 +809,7 @@


                    if(1 == language){


                        document.getElementById("english").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("包裹收据");


                        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");


@@ -834,6 +844,7 @@


                    if(2 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("french").remove();


                        document.getElementsByTag("title").get(0).text("Package 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");


@@ -868,6 +879,7 @@


                    if(3 == language){


                        document.getElementById("chinese").remove();


                        document.getElementById("english").remove();


                        document.getElementsByTag("title").get(0).text("Reçu de colis");


                        Element title_french = document.getElementById("title_french");


                        title_french.text(DateUtil.conversionFormat(language, sdf2.format(orderLogistics.getTravelTime())) + "，Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le ");


                        Element xcf_french = document.getElementById("xcf_french");


@@ -1151,6 +1163,7 @@


                document.getElementById("driverAudit").remove();


                document.getElementById("carAudit").remove();




                document.getElementsByTag("title").get(0).text("取件码");


                Element email_user = document.getElementById("email_user");


                email_user.text("您好 " + userInfo.getFirstName() + " " + userInfo.getLastName());


                Element email_content = document.getElementById("email_content");


@@ -1169,6 +1182,7 @@


                document.getElementById("driverAudit1").remove();


                document.getElementById("carAudit1").remove();




                document.getElementsByTag("title").get(0).text("Pickup code");


                Element email1_user = document.getElementById("email1_user");


                email1_user.text("Hello " + userInfo.getFirstName() + " " + userInfo.getLastName());


                Element email1_content = document.getElementById("email1_content");


@@ -1187,6 +1201,7 @@


                document.getElementById("driverAudit2").remove();


                document.getElementById("carAudit2").remove();




                document.getElementsByTag("title").get(0).text("Code de ramassage");


                Element email2_user = document.getElementById("email2_user");


                email2_user.text("Bonjour " + userInfo.getFirstName() + " " + userInfo.getLastName());


                Element email2_content = document.getElementById("email2_content");




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


@@ -210,6 +210,7 @@


                break;


        }


        smsUtil.sendCellulantMessage(phone, sms);


        smsrecordService.saveData(type, phone, authCode, sms);


        System.out.println(sms);


        return ResultUtil.success();


    }


@@ -242,10 +243,11 @@


            document.getElementById("driverAudit").remove();


            document.getElementById("carAudit").remove();




            document.getElementsByTag("title").get(0).text("验证码");


            Element email_user = document.getElementById("email_user");


            email_user.text("您好 ，");


            Element email_content = document.getElementById("email_content");


            email_content.text("邮件验证码是：" + authCode + "，请在5分钟内完成验证");


            email_content.text("您正在绑定邮箱，本次请求的邮件验证码是：" + authCode + "，请在5分钟内完成验证");


        }


        if(2 == language){


            document.getElementById("chinese").remove();


@@ -260,10 +262,11 @@


            document.getElementById("driverAudit1").remove();


            document.getElementById("carAudit1").remove();




            document.getElementsByTag("title").get(0).text("Verification code");


            Element email1_user = document.getElementById("email1_user");


            email1_user.text("Hello ，");


            Element email1_content = document.getElementById("email1_content");


            email1_content.text("verification code is " + authCode + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");


            email1_content.text("Your package pickup code is " + authCode + ", please complete the verification within 5 minutes");


        }


        if(3 == language){


            document.getElementById("chinese").remove();


@@ -278,10 +281,11 @@


            document.getElementById("driverAudit2").remove();


            document.getElementById("carAudit2").remove();




            document.getElementsByTag("title").get(0).text("Code de validation");


            Element email2_user = document.getElementById("email2_user");


            email2_user.text("Hello ，");


            Element email2_content = document.getElementById("email2_content");


            email2_content.text("Vous êtes lié à une adresse e-mail. Le code de vérification e-mail pour cette demande est: " + authCode + ". Veuillez compléter la vérification dans les 5 minutes");


            email2_content.text("Le code de ramassage de votre colis est " + authCode + ", veuillez effectuer la verification dans les 5minutes.");


        }


        EmailUtil.send(email, language == 1 ? "验证码" : language == 2 ? "Verification code" : "Code de validation",  document.html());


        return ResultUtil.success();


@@ -348,6 +352,7 @@


                        document.getElementById("driverAudit").remove();


                        document.getElementById("carAudit").remove();




                        document.getElementsByTag("title").get(0).text("邀请奖励");


                        Element invite_user = document.getElementById("invite_user");


                        invite_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        Element invite_content = document.getElementById("invite_content");


@@ -366,6 +371,7 @@


                        document.getElementById("driverAudit1").remove();


                        document.getElementById("carAudit1").remove();




                        document.getElementsByTag("title").get(0).text("Invite and earn");


                        Element invite1_user = document.getElementById("invite1_user");


                        invite1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        Element invite1_content = document.getElementById("invite1_content");


@@ -384,8 +390,9 @@


                        document.getElementById("driverAudit2").remove();


                        document.getElementById("carAudit2").remove();




                        document.getElementsByTag("title").get(0).text("Invitez et récompensez");


                        Element invite2_user = document.getElementById("invite2_user");


                        invite2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        invite2_user.text("Bonjour " + driver.getFirstName() + " " + driver.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");


                    }


@@ -629,6 +636,7 @@


                document1.getElementById("driverAudit").remove();


                document1.getElementById("carAudit").remove();




                document1.getElementsByTag("title").get(0).text("注册成功");


                Element settle_user = document1.getElementById("settle_user");


                settle_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -645,6 +653,7 @@


                document1.getElementById("driverAudit1").remove();


                document1.getElementById("carAudit1").remove();




                document1.getElementsByTag("title").get(0).text("Registered successfully");


                Element settle1_user = document1.getElementById("settle1_user");


                settle1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -661,6 +670,7 @@


                document1.getElementById("driverAudit2").remove();


                document1.getElementById("carAudit2").remove();




                document1.getElementsByTag("title").get(0).text("Enregistré avec succès");


                Element settle2_user = document1.getElementById("settle2_user");


                settle2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -751,6 +761,7 @@


                document1.getElementById("driverAudit").remove();


                document1.getElementById("carAudit").remove();




                document1.getElementsByTag("title").get(0).text("重置密码");


                Element pass_user = document1.getElementById("pass_user");


                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -767,6 +778,7 @@


                document1.getElementById("driverAudit1").remove();


                document1.getElementById("carAudit1").remove();




                document1.getElementsByTag("title").get(0).text("Reset password");


                Element pass1_user = document1.getElementById("pass1_user");


                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -783,6 +795,7 @@


                document1.getElementById("driverAudit2").remove();


                document1.getElementById("carAudit2").remove();




                document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");


                Element pass2_user = document1.getElementById("pass2_user");


                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -832,7 +845,6 @@


            emailService.insert(tEmail);


        }




        smsrecordService.saveData(6, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");


        return ResultUtil.success();


    }




@@ -1221,8 +1233,6 @@


        driver1.setPhoneOperator(phoneOperator);


        driver1.setPhone(phone);


        this.updateById(driver1);




        smsrecordService.saveData(7, phone, code, "短信验证码【" + code + "】已发到您的手机，验证码将在5分钟后失效，请及时登录!");


        return ResultUtil.success();


    }




@@ -1273,6 +1283,7 @@


                document1.getElementById("driverAudit").remove();


                document1.getElementById("carAudit").remove();




                document1.getElementsByTag("title").get(0).text("重置密码");


                Element pass_user = document1.getElementById("pass_user");


                pass_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -1289,6 +1300,7 @@


                document1.getElementById("driverAudit1").remove();


                document1.getElementById("carAudit1").remove();




                document1.getElementsByTag("title").get(0).text("Reset password");


                Element pass1_user = document1.getElementById("pass1_user");


                pass1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -1305,6 +1317,7 @@


                document1.getElementById("driverAudit2").remove();


                document1.getElementById("carAudit2").remove();




                document1.getElementsByTag("title").get(0).text("Réinitialiser le mot de passe");


                Element pass2_user = document1.getElementById("pass2_user");


                pass2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


            }


@@ -1633,12 +1646,13 @@


                            document1.getElementById("driverAudit").remove();


                            document1.getElementById("carAudit").remove();




                            document1.getElementsByTag("title").get(0).text("今日活动");


                            Element rewardToday_user = document1.getElementById("rewardToday_user");


                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday_award = document1.getElementById("rewardToday_award");


                            rewardToday_award.text("奖金 GHS" + driverActivityHistory.getMoney());


                            Element rewardToday_content = document1.getElementById("rewardToday_content");


                            rewardToday_content.text("邀请司机注册即可活动奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");


                            rewardToday_content.text("邀请司机注册即可获得奖励。 注意此活动是有时间限制的，详情请查看I-GO平台。");


                        }


                        if (2 == language) {


                            document1.getElementById("chinese").remove();


@@ -1653,6 +1667,7 @@


                            document1.getElementById("driverAudit1").remove();


                            document1.getElementById("carAudit1").remove();




                            document1.getElementsByTag("title").get(0).text("Today's activities");


                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");


                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday1_award = document1.getElementById("rewardToday1_award");


@@ -1673,6 +1688,7 @@


                            document1.getElementById("driverAudit2").remove();


                            document1.getElementById("carAudit2").remove();




                            document1.getElementsByTag("title").get(0).text("Activités du jour");


                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");


                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday2_award = document1.getElementById("rewardToday2_award");


@@ -1757,6 +1773,7 @@


                            document1.getElementById("driverAudit").remove();


                            document1.getElementById("carAudit").remove();




                            document1.getElementsByTag("title").get(0).text("今日活动");


                            Element rewardToday_user = document1.getElementById("rewardToday_user");


                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday_award = document1.getElementById("rewardToday_award");


@@ -1777,6 +1794,7 @@


                            document1.getElementById("driverAudit1").remove();


                            document1.getElementById("carAudit1").remove();




                            document1.getElementsByTag("title").get(0).text("Today's activities");


                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");


                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday1_award = document1.getElementById("rewardToday1_award");


@@ -1797,6 +1815,7 @@


                            document1.getElementById("driverAudit2").remove();


                            document1.getElementById("carAudit2").remove();




                            document1.getElementsByTag("title").get(0).text("Activités du jour");


                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");


                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday2_award = document1.getElementById("rewardToday2_award");


@@ -1882,6 +1901,7 @@


                            document1.getElementById("driverAudit").remove();


                            document1.getElementById("carAudit").remove();




                            document1.getElementsByTag("title").get(0).text("今日活动");


                            Element rewardToday_user = document1.getElementById("rewardToday_user");


                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday_award = document1.getElementById("rewardToday_award");


@@ -1902,6 +1922,7 @@


                            document1.getElementById("driverAudit1").remove();


                            document1.getElementById("carAudit1").remove();




                            document1.getElementsByTag("title").get(0).text("Today's activities");


                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");


                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday1_award = document1.getElementById("rewardToday1_award");


@@ -1922,6 +1943,7 @@


                            document1.getElementById("driverAudit2").remove();


                            document1.getElementById("carAudit2").remove();




                            document1.getElementsByTag("title").get(0).text("Activités du jour");


                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");


                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday2_award = document1.getElementById("rewardToday2_award");


@@ -2007,6 +2029,7 @@


                            document1.getElementById("driverAudit").remove();


                            document1.getElementById("carAudit").remove();




                            document1.getElementsByTag("title").get(0).text("今日活动");


                            Element rewardToday_user = document1.getElementById("rewardToday_user");


                            rewardToday_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday_award = document1.getElementById("rewardToday_award");


@@ -2027,6 +2050,7 @@


                            document1.getElementById("driverAudit1").remove();


                            document1.getElementById("carAudit1").remove();




                            document1.getElementsByTag("title").get(0).text("Today's activities");


                            Element rewardToday1_user = document1.getElementById("rewardToday1_user");


                            rewardToday1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday1_award = document1.getElementById("rewardToday1_award");


@@ -2047,6 +2071,7 @@


                            document1.getElementById("driverAudit2").remove();


                            document1.getElementById("carAudit2").remove();




                            document1.getElementsByTag("title").get(0).text("Activités du jour");


                            Element rewardToday2_user = document1.getElementById("rewardToday2_user");


                            rewardToday2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element rewardToday2_award = document1.getElementById("rewardToday2_award");


@@ -2157,6 +2182,7 @@


                            document1.getElementById("driverAudit").remove();


                            document1.getElementById("carAudit").remove();




                            document1.getElementsByTag("title").get(0).text("在线时长奖励");


                            Element reward_user = document1.getElementById("reward_user");


                            reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element reward_content = document1.getElementById("reward_content");


@@ -2175,6 +2201,7 @@


                            document1.getElementById("driverAudit1").remove();


                            document1.getElementById("carAudit1").remove();




                            document1.getElementsByTag("title").get(0).text("Online-duration reward");


                            Element reward1_user = document1.getElementById("reward1_user");


                            reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element reward1_content = document1.getElementById("reward1_content");


@@ -2193,6 +2220,7 @@


                            document1.getElementById("driverAudit2").remove();


                            document1.getElementById("carAudit2").remove();




                            document1.getElementsByTag("title").get(0).text("Récompenses de temps en ligne");


                            Element reward2_user = document1.getElementById("reward2_user");


                            reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                            Element reward2_content = document1.getElementById("reward2_content");


@@ -2284,6 +2312,7 @@


                        document1.getElementById("driverAudit").remove();


                        document1.getElementById("carAudit").remove();




                        document1.getElementsByTag("title").get(0).text("累计接单奖励");


                        Element reward_user = document1.getElementById("reward_user");


                        reward_user.text("您好 " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        Element reward_content = document1.getElementById("reward_content");


@@ -2302,6 +2331,7 @@


                        document1.getElementById("driverAudit1").remove();


                        document1.getElementById("carAudit1").remove();




                        document1.getElementsByTag("title").get(0).text("Cumulative orders reward");


                        Element reward1_user = document1.getElementById("reward1_user");


                        reward1_user.text("Hello " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        Element reward1_content = document1.getElementById("reward1_content");


@@ -2320,6 +2350,7 @@


                        document1.getElementById("driverAudit2").remove();


                        document1.getElementById("carAudit2").remove();




                        document1.getElementsByTag("title").get(0).text("Récompense cumulée des commandes");


                        Element reward2_user = document1.getElementById("reward2_user");


                        reward2_user.text("Bonjour " + driver.getFirstName() + "" + driver.getLastName() + "，");


                        Element reward2_content = document1.getElementById("reward2_content");




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


@@ -15,7 +15,6 @@


import org.springframework.transaction.annotation.Isolation;


import org.springframework.transaction.annotation.Propagation;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.client.RestTemplate;




import javax.annotation.Resource;


import java.math.BigDecimal;


@@ -34,16 +33,6 @@




    @Autowired


    private IDriverService driverService;




    /*@Autowired


    private ICBCPayUtil icbcPayUtil;*/




    @Autowired


    private RestTemplate internalRestTemplate;








    private Map<String, Timer> timerMap = new HashMap<>();










 DriverIGOTravel/guns-admin/src/main/resources/application-produce.yml


@@ -43,7 +43,7 @@




spring:


  datasource:


    url: jdbc:mysql://182.160.16.251:3306/igotravel?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B0


    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 #用来搜集数据库的所有表




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


@@ -1,31 +1,31 @@


package com.stylefeng.guns;




import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;


import org.junit.Test;


import org.junit.runner.RunWith;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.boot.test.context.SpringBootTest;


import org.springframework.test.context.junit4.SpringRunner;




import java.util.Map;




/**


 * @author zhibing.pu


 * @Date 2023/12/5 11:22


 */


@RunWith(SpringRunner.class)


@SpringBootTest


public class GunsApplicationTest {




    @Autowired


    private IOrderEvaluateService orderEvaluateService;




    @Test


    public void test(){


        try {


            Map<String, Object> map = orderEvaluateService.queryEvaluate(3, 1, 10, 2508);


        }catch (Exception e){


            e.printStackTrace();


        }


    }


}


//package com.stylefeng.guns;


//


//import com.stylefeng.guns.modular.system.service.IOrderEvaluateService;


//import org.junit.Test;


//import org.junit.runner.RunWith;


//import org.springframework.beans.factory.annotation.Autowired;


//import org.springframework.boot.test.context.SpringBootTest;


//import org.springframework.test.context.junit4.SpringRunner;


//


//import java.util.Map;


//


///**


// * @author zhibing.pu


// * @Date 2023/12/5 11:22


// */


//@RunWith(SpringRunner.class)


//@SpringBootTest


//public class GunsApplicationTest {


//


//    @Autowired


//    private IOrderEvaluateService orderEvaluateService;


//


//    @Test


//    public void test(){


//        try {


//            Map<String, Object> map = orderEvaluateService.queryEvaluate(3, 1, 10, 2508);


//        }catch (Exception e){


//            e.printStackTrace();


//        }


//    }


//}