From b997fbe016ace57406e8938ebba3f8c176fbabf9 Mon Sep 17 00:00:00 2001 From: puzhibing <393733352@qq.com> Date: 星期五, 04 八月 2023 10:34:30 +0800 Subject: [PATCH] 新增加国外短信 --- UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 152 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 102 insertions(+), 50 deletions(-) diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java index ed29a35..8e24eca 100644 --- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java +++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java @@ -29,6 +29,8 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; +import org.jsoup.nodes.FormElement; +import org.jsoup.select.Elements; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -294,8 +296,9 @@ this.insert(orderLogistics); //添加消息 - systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内小件物流订单已下单成功,我们正在为您指派司机,请稍后!" : - language == 2 ? "Your local small parts logistics order has been successfully placed, we are assigning you a driver, please wait!" : "Votre commande de city small pieces logistics a été passée avec succès. Nous vous assignons un chauffeur. Plus tard!", orderLogistics.getUserId(), 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您的市内包裹订单已下单成功,我们正在为您指派司机,请稍后!" : + language == 2 ? "Your parcel order has been successfully placed, we are assigning a driver for you, please wait!" + : "Votre commande de colis a bien été passée, nous vous assignons un chauffeur, veuillez patienter!", orderLogistics.getUserId(), 1); BaseWarpper baseWarpper = new BaseWarpper(); baseWarpper.setId(orderLogistics.getId()); @@ -549,7 +552,7 @@ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 - transactionDetailsService.saveData(uid, "小件物流下单支付", orderMoney, 2, 1, 1, 4, orderId); + transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId); userInfoService.updateById(userInfo); orderLogistics.setState(1);//小件物流先支付后司机抢单 @@ -563,9 +566,10 @@ Document document = Jsoup.parse(new File(path), "UTF-8"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + Driver driver = driverService.selectById(orderLogistics.getDriverId()); if(1 == language){ - document.getElementById("english").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("english").remove(); + document.getElementById("french").remove(); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + ",您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -578,14 +582,19 @@ pay_money_chinese.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_chinese = document.getElementsByClass("driver_chinese"); + for (int i = 0; i < driver_chinese.size(); i++) { + Element element = driver_chinese.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); end_address_chinese.text(orderLogistics.getEndAddress()); } if(2 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); Element title_english = document.getElementById("title_english"); title_english.text(sdf2.format(orderLogistics.getTravelTime()) + ",You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -598,14 +607,19 @@ pay_money_english.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_english = document.getElementsByClass("driver_english"); + for (int i = 0; i < driver_english.size(); i++) { + Element element = driver_english.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); end_address_english.text(orderLogistics.getEndAddress()); } if(3 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("english").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); Element title_french = document.getElementById("title_french"); title_french.text(sdf2.format(orderLogistics.getTravelTime()) + ",Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le "); Element xcf_french = document.getElementById("xcf_french"); @@ -618,13 +632,18 @@ pay_money_french.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_french = document.getElementsByClass("driver_french"); + for (int i = 0; i < driver_french.size(); i++) { + Element element = driver_french.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); end_address_french.text(orderLogistics.getEndAddress()); } - EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html()); + EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html()); } // TODO: 2020/5/24 这里需要给司机和用户推送订单状态 @@ -634,9 +653,9 @@ pushUtil.pushOrderState(1, orderLogistics.getUserId(), orderLogistics.getId(), orderLogistics.getType(), orderLogistics.getState(), 0); } }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付,谢谢使用!" : language == 2 - ? "You have successfully completed the small parts logistics order payment, thank you for using!" : - "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", uid, 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付,谢谢使用!" : language == 2 + ? "You have successfully completed the parcel order payment, thank you for using!" : + "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1); this.pushOrder(orderLogistics);//推单 } @@ -645,7 +664,7 @@ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 - transactionDetailsService.saveData(uid, "小件物流下单支付", orderMoney, 2, 1, 1, 4, orderId); + transactionDetailsService.saveData(uid, "包裹下单支付", orderMoney, 2, 1, 1, 4, orderId); userInfoService.updateById(userInfo); orderLogistics.setState(1);//小件物流先支付后司机抢单 @@ -658,9 +677,10 @@ Document document = Jsoup.parse(new File(path), "UTF-8"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + Driver driver = driverService.selectById(orderLogistics.getDriverId()); if(1 == language){ - document.getElementById("english").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("english").remove(); + document.getElementById("french").remove(); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(sdf2.format(orderLogistics.getTravelTime()) + ",您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -673,14 +693,19 @@ pay_money_chinese.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_chinese = document.getElementsByClass("driver_chinese"); + for (int i = 0; i < driver_chinese.size(); i++) { + Element element = driver_chinese.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); end_address_chinese.text(orderLogistics.getEndAddress()); } if(2 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); Element title_english = document.getElementById("title_english"); title_english.text(sdf2.format(orderLogistics.getTravelTime()) + ",You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -693,14 +718,19 @@ pay_money_english.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_english = document.getElementsByClass("driver_english"); + for (int i = 0; i < driver_english.size(); i++) { + Element element = driver_english.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); end_address_english.text(orderLogistics.getEndAddress()); } if(3 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("english").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); Element title_french = document.getElementById("title_french"); title_french.text(sdf2.format(orderLogistics.getTravelTime()) + ",Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le "); Element xcf_french = document.getElementById("xcf_french"); @@ -713,13 +743,18 @@ pay_money_french.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_french = document.getElementsByClass("driver_french"); + for (int i = 0; i < driver_french.size(); i++) { + Element element = driver_french.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); end_address_french.text(orderLogistics.getEndAddress()); } - EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html()); + EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html()); } @@ -732,9 +767,9 @@ } }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付,谢谢使用!" : language == 2 - ? "You have successfully completed the small parts logistics order payment, thank you for using!" : - "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", uid, 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付,谢谢使用!" : language == 2 + ? "You have successfully completed the parcel order payment, thank you for using!" : + "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", uid, 1); this.pushOrder(orderLogistics);//推单 } @@ -811,7 +846,7 @@ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 - transactionDetailsService.saveData(uid, "小件物流补差价", orderMoney, 2, 1, 1, 4, orderId); + transactionDetailsService.saveData(uid, "包裹补差价", orderMoney, 2, 1, 1, 4, orderId); userInfoService.updateById(userInfo); orderLogistics.setState(12);//已支付差价 @@ -857,9 +892,9 @@ } }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付,谢谢使用!" : language == 2 - ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!" - : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", uid, 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付,谢谢使用!" : language == 2 + ? "You have successfully completed the difference payment of parcel order, thank you for using!" + : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1); } if(payType == 4){//现金支付 @@ -867,7 +902,7 @@ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 - transactionDetailsService.saveData(uid, "小件物流补差价", orderMoney, 2, 1, 1, 4, orderId); + transactionDetailsService.saveData(uid, "包裹补差价", orderMoney, 2, 1, 1, 4, orderId); userInfoService.updateById(userInfo); orderLogistics.setState(12);//已支付差价 @@ -914,9 +949,9 @@ } }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付,谢谢使用!" : language == 2 - ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!" - : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", uid, 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付,谢谢使用!" : language == 2 + ? "You have successfully completed the difference payment of parcel order, thank you for using!" + : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", uid, 1); } @@ -952,9 +987,10 @@ Document document = Jsoup.parse(new File(path), "UTF-8"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy年MM月dd日"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + Driver driver = driverService.selectById(orderLogistics.getDriverId()); if(1 == language){ - document.getElementById("english").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("english").remove(); + document.getElementById("french").remove(); Element title_chinese = document.getElementById("title_chinese"); title_chinese.text(sdf.format(orderLogistics.getTravelTime()) + ",您在I-GO1个订单消费GHS " + orderLogistics.getPayMoney()); Element xcf_chinese = document.getElementById("xcf_chinese"); @@ -967,14 +1003,19 @@ pay_money_chinese.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_chinese = document.getElementById("pay_time_chinese"); pay_time_chinese.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_chinese = document.getElementsByClass("driver_chinese"); + for (int i = 0; i < driver_chinese.size(); i++) { + Element element = driver_chinese.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_chinese = document.getElementById("start_address_chinese"); start_address_chinese.text(orderLogistics.getStartAddress()); Element end_address_chinese = document.getElementById("end_address_chinese"); end_address_chinese.text(orderLogistics.getEndAddress()); } if(2 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("french").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("french").remove(); Element title_english = document.getElementById("title_english"); title_english.text(sdf.format(orderLogistics.getTravelTime()) + ",You spent GHS " + orderLogistics.getPayMoney() + " on the trip "); Element xcf_english = document.getElementById("xcf_english"); @@ -987,14 +1028,19 @@ pay_money_english.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_english = document.getElementById("pay_time_english"); pay_time_english.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_english = document.getElementsByClass("driver_english"); + for (int i = 0; i < driver_english.size(); i++) { + Element element = driver_english.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_english = document.getElementById("start_address_english"); start_address_english.text(orderLogistics.getStartAddress()); Element end_address_english = document.getElementById("end_address_english"); end_address_english.text(orderLogistics.getEndAddress()); } if(3 == language){ - document.getElementById("chinese").attr("style", "display: none;"); - document.getElementById("english").attr("style", "display: none;"); + document.getElementById("chinese").remove(); + document.getElementById("english").remove(); Element title_french = document.getElementById("title_french"); title_french.text(sdf.format(orderLogistics.getTravelTime()) + ",Vous consommez GHS " + orderLogistics.getPayMoney() + " sur votre commande i-go1 le "); Element xcf_french = document.getElementById("xcf_french"); @@ -1007,13 +1053,18 @@ pay_money_french.text("GHS " + orderLogistics.getPayMoney()); Element pay_time_french = document.getElementById("pay_time_french"); pay_time_french.text(sdf1.format(orderLogistics.getTravelTime())); + Elements driver_french = document.getElementsByClass("driver_french"); + for (int i = 0; i < driver_french.size(); i++) { + Element element = driver_french.get(i); + element.text(driver.getFirstName() + "." + driver.getLastName()); + } Element start_address_french = document.getElementById("start_address_french"); start_address_french.text(orderLogistics.getStartAddress()); Element end_address_french = document.getElementById("end_address_french"); end_address_french.text(orderLogistics.getEndAddress()); } - EmailUtil.send(userInfo.getEmail(), language == 1 ? "市内小件物流收据" : language == 2 ? "Reset password" : "Réinitialiser le mot de passe", document.html()); + EmailUtil.send(userInfo.getEmail(), language == 1 ? "包裹收据" : language == 2 ? "Parcel receipt" : "Réception de colis", document.html()); } @@ -1027,9 +1078,9 @@ }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单支付,谢谢使用!" : language == 2 - ? "You have successfully completed the small parts logistics order payment, thank you for using!" : - "Vous avez complété avec succès le paiement de la commande small pieces logistics. Merci d’utiliser!", orderLogistics.getUserId(), 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单支付,谢谢使用!" : language == 2 + ? "You have successfully completed the parcel order payment, thank you for using!" : + "Vous avez terminé avec succès le paiement de la commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); this.pushOrder(orderLogistics);//推单 }else{ @@ -1061,7 +1112,7 @@ userInfo.setIntegral(userInfo.getIntegral() + (orderMoney.intValue() * query1.getIntegral()));//积分 //添加交易明细 - transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流补差价", orderMoney, 2, 1, 1, 4, id); + transactionDetailsService.saveData(orderLogistics.getUserId(), "包裹补差价", orderMoney, 2, 1, 1, 4, id); userInfoService.updateById(userInfo); orderLogistics.setState(12);//已支付差价 @@ -1102,9 +1153,9 @@ } }).start(); - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成小件物流订单差价支付,谢谢使用!" : language == 2 - ? "You have successfully completed the price difference payment of small parts logistics order, thank you for using!" - : "Vous avez complété avec succès le paiement de la différence de prix de la commande de petites pièces logistiques, merci d’utiliser!", orderLogistics.getUserId(), 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功完成包裹订单差价支付,谢谢使用!" : language == 2 + ? "You have successfully completed the difference payment of parcel order, thank you for using!" + : "Vous avez complété avec succès le paiement de la différence de commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); }else{ System.err.println("预支付数据异常(orderId = " + id + ")"); } @@ -1135,9 +1186,9 @@ * @throws Exception */ @Override - public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size) throws Exception { + public List<Map<String, Object>> queryMyOrderList(Integer uid, Integer pageNum, Integer size, Integer language) throws Exception { pageNum = (pageNum - 1) * size; - List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size); + List<Map<String, Object>> maps = orderLogisticsMapper.queryMyOrderList(uid, pageNum, size, language); return maps; } @@ -1276,7 +1327,7 @@ integer = orderCancel.getId(); //添加交易明细 - transactionDetailsService.saveData(orderLogistics.getUserId(), "小件物流取消退款", orderLogistics.getPayMoney(), 1, 1, 1, 4, orderLogistics.getId()); + transactionDetailsService.saveData(orderLogistics.getUserId(), "包裹取消退款", orderLogistics.getPayMoney(), 1, 1, 1, 4, orderLogistics.getId()); } if(null != orderLogistics.getDriverId()){ @@ -1289,7 +1340,8 @@ } //添加消息 - systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消小件物流订单,谢谢使用!" : language == 2 ? "You have successfully cancelled the small logistics order, thank you for using" : "Vous avez annulé avec succès la petite commande logistique, merci d'utiliser", orderLogistics.getUserId(), 1); + systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消包裹订单,谢谢使用!" : language == 2 ? "You have successfully cancelled your parcel order, thank you for using!" + : "Vous avez annulé avec succès votre commande de colis, merci de l’utiliser!", orderLogistics.getUserId(), 1); Map<String, Object> map = new HashMap<>(); map.put("id", integer); return ResultUtil.success(map); -- Gitblit v1.7.1