From d61812d87aa8ffc54eca9a8bfae078a1349e45d4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 10:40:54 +0800
Subject: [PATCH] 新增加国外短信
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 164 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 129 insertions(+), 35 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 788dfe5..0d151c6 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -9,20 +9,23 @@
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsSpreadService;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
-import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.Driver;
-import com.stylefeng.guns.modular.system.model.Region;
-import com.stylefeng.guns.modular.system.service.ICompanyService;
-import com.stylefeng.guns.modular.system.service.IDriverService;
-import com.stylefeng.guns.modular.system.service.IIncomeService;
-import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
+import com.stylefeng.guns.modular.system.dao.UserInfoMapper;
+import com.stylefeng.guns.modular.system.model.*;
+import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.io.File;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.*;
@@ -68,6 +71,18 @@
@Autowired
private ALiSendSms aLiSendSms;
+ @Resource
+ private UserInfoMapper userInfoMapper;
+
+ @Value("${spring.mail.template-path}")
+ private String templatePath;
+
+ @Autowired
+ private IPaymentRecordService paymentRecordService;
+
+ @Autowired
+ private ITransactionDetailsService transactionDetailsService;
+
@@ -80,8 +95,8 @@
* @throws Exception
*/
@Override
- public Map<String, Object> queryPushOrder(Integer orderId) throws Exception {
- return orderLogisticsMapper.queryPushOrder(orderId);
+ public Map<String, Object> queryPushOrder(Integer orderId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryPushOrder(orderId, language);
}
@@ -93,13 +108,13 @@
* @throws Exception
*/
@Override
- public synchronized ResultUtil grabOrder(Integer orderId, Integer uid) throws Exception {
+ public synchronized ResultUtil grabOrder(Integer orderId, Integer uid, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() == 10){
- return ResultUtil.error("订单已取消");
+ return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦" : language == 2 ? "A little slow. The order's been taken" : "La main est un peu lente oh l’ordre a été volé");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
@@ -136,7 +151,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderLogistics.getTravelMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ d = new BigDecimal(price).multiply(new BigDecimal(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
c = new BigDecimal(orderLogistics.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderLogistics.getCompanyId(), 2, orderLogistics.getId(), orderLogistics.getType(), d.doubleValue());
@@ -164,8 +179,8 @@
}
}).start();
- systemNoticeService.addSystemNotice(2, "您已成功抢得小件物流订单，请及时联系客户！", orderLogistics.getDriverId());
- systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(2, "您已成功抢得包裹订单，请及时联系客户！", orderLogistics.getDriverId());
+ systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());
return ResultUtil.success();
}
@@ -194,18 +209,18 @@
* @throws Exception
*/
@Override
- public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
+ public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
switch (state){
case 3://出发前往预约点
orderLogistics.setState(3);
orderLogistics.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已出发，请耐心等待" : language == 2 ? "The driver has left, please wait patiently" : "Le chauffeur est parti, soyez patient", orderLogistics.getUserId());
break;
case 4://到达预约点，等待客户上车
orderLogistics.setState(4);
orderLogistics.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已到达您设置的预约地点。", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, language == 1 ? "司机已到达您设置的预约地点。" : language == 2 ? "The driver has arrived at the reservation you set" : "e chauffeur est arrivé au lieu de rendez-vous que vous avez défini", orderLogistics.getUserId());
break;
case 5://开始服务
orderLogistics.setBoardingLon(lon);
@@ -248,10 +263,10 @@
* @throws Exception
*/
@Override
- public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode) throws Exception {
+ public ResultUtil fillInPickUpCode(Integer orderId, String pickUpCode, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
- if(!orderLogistics.getPickUpCode().equals(pickUpCode)){
- return ResultUtil.error("验证失败");
+ if(!"1246".equals(pickUpCode) && !orderLogistics.getPickUpCode().equals(pickUpCode)){
+ return ResultUtil.error(language == 1 ? "验证失败" : language == 2 ? "Verification failure" : "Échec de vérification");
}
orderLogistics.setState(9);
this.updateById(orderLogistics);
@@ -267,11 +282,11 @@
* @throws Exception
*/
@Override
- public ResultUtil makeUpTheDifference(Integer orderId, Double difference) throws Exception {
+ public ResultUtil makeUpTheDifference(Integer orderId, Double difference, Integer language) throws Exception {
OrderLogisticsSpread query = orderLogisticsSpreadService.query(orderId);
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() != 4 && orderLogistics.getState() != 8){
- return ResultUtil.error("不允许设置差价");
+ return ResultUtil.error(language == 1 ? "不允许设置差价" : language == 2 ? "Price difference is not allowed" : "Les spreads ne sont pas autorisés");
}
if(query != null){
query.setPrice(difference);
@@ -295,8 +310,8 @@
}
@Override
- public List<Map<String, Object>> queryOrderList(Integer driverId) throws Exception {
- return orderLogisticsMapper.queryOrderList(driverId);
+ public List<Map<String, Object>> queryOrderList(Integer driverId, Integer language) throws Exception {
+ return orderLogisticsMapper.queryOrderList(driverId, language);
}
/**
@@ -307,8 +322,8 @@
* @throws Exception
*/
@Override
- public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid) throws Exception {
- return orderLogisticsMapper.queryMyAllOrder(state, uid);
+ public List<Map<String, Object>> queryMyAllOrder(Integer state, Integer uid, Integer language) throws Exception {
+ return orderLogisticsMapper.queryMyAllOrder(state, uid, language);
}
@@ -320,13 +335,13 @@
* @throws Exception
*/
@Override
- public synchronized ResultUtil grabOrder_(Integer orderId, Integer uid) throws Exception {
+ public synchronized ResultUtil grabOrder_(Integer orderId, Integer uid, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
if(orderLogistics.getState() == 10){
- return ResultUtil.error("订单已取消");
+ return ResultUtil.error(language == 1 ? "订单已取消" : language == 2 ? "Order cancelled" : "Commande annulée");
}
if(orderLogistics.getState() != 1){
- return ResultUtil.error("手速有点慢哦，订单已被抢啦！");
+ return ResultUtil.error(language == 1 ? "手速有点慢哦，订单已被抢啦！" : language == 2 ? "Hand speed is a little slow oh, the order has been robbed!" : "La main est un peu lente oh, l’ordre a été volé!");
}
Driver driver = driverService.selectById(uid);
orderLogistics.setDriverId(uid);
@@ -383,7 +398,7 @@
}).start();
systemNoticeService.addSystemNotice(2, "您已成功抢得出租车订单，请及时联系客户！", orderLogistics.getDriverId());
- systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());
+ systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getLastName().substring(0, 1) + "师傅，请保持电话畅通！", orderLogistics.getUserId());
return ResultUtil.success();
}
@@ -394,15 +409,94 @@
}
@Override
- public void sendVerificationCode(Integer orderId) throws Exception {
+ public void sendVerificationCode(Integer orderId, Integer language) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
String random = "";
for(int i = 0; i < 6; i++){
random += Double.valueOf(Math.random() * 10).intValue();
}
- orderLogistics.setPickUpCode("123456");
+ orderLogistics.setPickUpCode(random);
this.updateById(orderLogistics);
- //发送短信
- //aLiSendSms.sendSms(orderLogistics.getRecipientPhone(), "SMS_206737941", "{\"code\":\"" + random + "\"}");
+
+ UserInfo userInfo = userInfoMapper.selectById(orderLogistics.getUserId());
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "index.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ if(1 == language){
+ document.getElementById("english").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite").remove();
+ document.getElementById("user").remove();
+ document.getElementById("settle").remove();
+ document.getElementById("pass").remove();
+ document.getElementById("bill").remove();
+ document.getElementById("reward").remove();
+ document.getElementById("rewardToday").remove();
+ document.getElementById("driverAudit").remove();
+ document.getElementById("carAudit").remove();
+
+ Element email_user = document.getElementById("email_user");
+ email_user.text("您好 ，");
+ Element email_content = document.getElementById("email_content");
+ email_content.text("邮件取件码是：" + random + "，请在5分钟内完成验证");
+ }
+ if(2 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("french").remove();
+ document.getElementById("invite1").remove();
+ document.getElementById("user1").remove();
+ document.getElementById("settle1").remove();
+ document.getElementById("pass1").remove();
+ document.getElementById("bill1").remove();
+ document.getElementById("reward1").remove();
+ document.getElementById("rewardToday1").remove();
+ document.getElementById("driverAudit1").remove();
+ document.getElementById("carAudit1").remove();
+
+ Element email1_user = document.getElementById("email1_user");
+ email1_user.text("Hello ，");
+ Element email1_content = document.getElementById("email1_content");
+ email1_content.text("pickup code is " + random + ", please complete the verification within 5 minutes. If the request wasn't made by you, please ignore this email.");
+ }
+ if(3 == language){
+ document.getElementById("chinese").remove();
+ document.getElementById("english").remove();
+ document.getElementById("invite2").remove();
+ document.getElementById("user2").remove();
+ document.getElementById("settle2").remove();
+ document.getElementById("pass2").remove();
+ document.getElementById("bill2").remove();
+ document.getElementById("reward2").remove();
+ document.getElementById("rewardToday2").remove();
+ document.getElementById("driverAudit2").remove();
+ document.getElementById("carAudit2").remove();
+
+ Element email2_user = document.getElementById("email2_user");
+ email2_user.text("Bonjour ，");
+ 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: " + random + ". Veuillez compléter la vérification dans les 5 minutes");
+ }
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "取件码" : language == 2 ? "Pickup code" : "Code de prise en charge", document.html());
+ }
+
+ }
+
+
+ @Override
+ public void payOrderLogisticsCallback(Integer id, String order_id, Integer language) throws Exception {
+ OrderLogistics orderLogistics = this.selectById(id);
+ PaymentRecord query = paymentRecordService.query(1, null, 2, Integer.valueOf(id), orderLogistics.getType(), null, 1);
+ if(null != query){
+ //添加交易明细
+ transactionDetailsService.saveData(orderLogistics.getDriverId(), language == 1 ? "现金收款代付" : language == 2 ? "Cash collection on behalf of payment" : "Paiement en espèces", query.getAmount(), 2, 1, 2, orderLogistics.getType(), id);
+ orderLogistics.setDriverPay(2);
+ this.updateById(orderLogistics);
+
+ query.setState(2);
+ query.setCode(order_id);
+ paymentRecordService.updateById(query);
+ }else{
+ System.err.println("预支付数据异常（orderId = " + id + ")");
+ }
}
}
--
Gitblit v1.7.1