From bec5cb722440d35c2e28d81b26c0cf4e39dfdd49 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 三月 2023 09:22:16 +0800
Subject: [PATCH] 修改bug
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 657 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 502 insertions(+), 155 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index 70242da..0e6513a 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -10,6 +10,8 @@
import com.stylefeng.guns.modular.crossCity.model.OrderCrossCity;
import com.stylefeng.guns.modular.crossCity.server.IOrderCrossCityService;
import com.stylefeng.guns.modular.crossCity.server.impl.OrderCrossCityServiceImpl;
+import com.stylefeng.guns.modular.smallLogistics.model.OrderLogistics;
+import com.stylefeng.guns.modular.smallLogistics.server.IOrderLogisticsService;
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
@@ -20,6 +22,8 @@
import com.stylefeng.guns.modular.system.util.GoogleMap.DistancematrixVo;
import com.stylefeng.guns.modular.system.util.GoogleMap.GoogleMapUtil;
import com.stylefeng.guns.modular.system.util.GoogleMap.ReverseGeocodeVo;
+import com.stylefeng.guns.modular.system.util.Tingg.TinggPayUtil;
+import com.stylefeng.guns.modular.system.util.Tingg.model.CheckoutRequest;
import com.stylefeng.guns.modular.system.warpper.BaseWarpper;
import com.stylefeng.guns.modular.system.warpper.EndPushWarpper;
import com.stylefeng.guns.modular.system.warpper.OrderInfoWarpper;
@@ -30,6 +34,9 @@
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
import com.stylefeng.guns.modular.taxi.service.IPaymentRecordService;
import com.stylefeng.guns.modular.taxi.service.ITransactionDetailsService;
+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.http.HttpEntity;
@@ -46,6 +53,9 @@
import java.io.FileInputStream;
import java.io.InputStreamReader;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
+import java.text.SimpleDateFormat;
import java.util.*;
@@ -112,9 +122,6 @@
@Autowired
private IPaymentRecordService paymentRecordService;
- /*@Autowired
- private ICBCPayUtil icbcPayUtil;*/
-
@Autowired
private PayMoneyUtil payMoneyUtil;
@@ -155,9 +162,6 @@
private IOrderPositionService orderPositionService;
@Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
private IOrderCrossCityService orderCrossCityService;
@Autowired
@@ -165,6 +169,15 @@
@Autowired
private ALiSendSms aLiSendSms;
+
+ @Resource
+ private CarMapper carMapper;
+
+ @Autowired
+ private IOrderEvaluateService orderEvaluateService;
+
+ @Autowired
+ private IOrderLogisticsService orderLogisticsService;
@Value("${filePath}")
@@ -178,8 +191,8 @@
@Value("${callbackPath}")
private String callbackPath;
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
+ @Value("${spring.mail.template-path}")
+ private String templatePath;
@@ -202,7 +215,7 @@
*/
@Override
public synchronized ResultUtil<BaseWarpper> saveOrderPrivateCar(Integer serverCarModelId, Date travelTime, Integer reservation, Integer instead, String placementLon, String placementLat, String startLon, String startLat,
- String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid) throws Exception {
+ String startAddress, String endLon, String endLat, String endAddress, String name, String phone, Integer orderSource, Integer driverId, Integer type, Integer uid, Integer language) throws Exception {
//如果出行时间大于当前10分钟则默认为预约单
if(travelTime.getTime() > (System.currentTimeMillis() + 600000)){
@@ -215,16 +228,16 @@
*/
List<OrderPrivateCar> orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
if(orderPrivateCars.size() > 0){
- return ResultUtil.error("有未完成的订单");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
}
List<OrderTaxi> list = orderTaxiMapper.queryByState_(uid, 1, 1, 1, 2, 3, 4, 5, 6, 11);
if(list.size() > 0){
- return ResultUtil.error("有未完成的订单");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
}
orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
if(orderPrivateCars.size() > 0 && reservation == 2){
- return ResultUtil.error("有未完成的订单");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
}
orderPrivateCars = orderPrivateCarMapper.queryByState(uid, 1, 1, 7,12);
@@ -238,7 +251,7 @@
list = orderTaxiMapper.queryByState_(uid, 2, 1, 1, 2, 3, 4, 5, 6, 11);
if(list.size() > 0 && reservation == 2){
- return ResultUtil.error("有未完成的订单");
+ return ResultUtil.error(language == 1 ? "有未完成的订单" : language == 2 ? "There are outstanding orders" : "Il y a des commandes en attente");
}
startAddress = startAddress.replaceAll("& #40;", "(");
@@ -246,7 +259,7 @@
endAddress = endAddress.replaceAll("& #40;", "(");
endAddress = endAddress.replaceAll("& #41;", ")");
if((orderSource == 1 || orderSource == 3) && null == serverCarModelId){
- return ResultUtil.error("请选择服务车型");
+ return ResultUtil.error(language == 1 ? "请选择服务车型" : language == 2 ? "Please select the service model" : "Veuillez sélectionner un modèle de service");
}
OrderPrivateCar orderPrivateCar = new OrderPrivateCar();
@@ -271,9 +284,9 @@
if(instead == 0 || ToolUtil.isEmpty(orderPrivateCar.getPassengers())){
UserInfo userInfo = userInfoService.selectById(uid);
if(ToolUtil.isEmpty(userInfo.getPhone())){
- return ResultUtil.error("请先绑定手机号码");
+ return ResultUtil.error(language == 1 ? "请先绑定手机号码" : language == 2 ? "Please bind the mobile phone number first" : "Veuillez d’abord lier le numéro de téléphone mobile");
}
- orderPrivateCar.setPassengers(userInfo.getName());
+ orderPrivateCar.setPassengers(userInfo.getFirstName() + "." + userInfo.getLastName());
orderPrivateCar.setPassengersPhone(userInfo.getPhone());
}
orderPrivateCar.setState(1);
@@ -284,26 +297,35 @@
if(orderSource == 2){//扫码下单
Driver driver = driverService.selectById(driverId);
if(null == driver){
- return ResultUtil.error("司机信息有误，无法完成下单");
+ return ResultUtil.error(language == 1 ? "司机信息有误，无法完成下单" : language == 2 ? "Incorrect driver information, unable to complete the order" : "Les informations du conducteur sont incorrectes pour compléter la commande");
}
if(driver.getAuthState() == 1){
- return ResultUtil.error("司机信息还未完成审核，无法完成下单");
+ return ResultUtil.error(language == 1 ? "司机信息还未完成审核，无法完成下单" : language == 2 ? "The driver information has not been reviewed, and the order cannot be completed" : "Les informations du conducteur n’ont pas été vérifiées et la commande n’a pas pu être finalisée");
}
if(driver.getAuthState() == 3){
- return ResultUtil.error("司机账户已被冻结，无法提供服务");
+ return ResultUtil.error(language == 1 ? "司机账户已被冻结，无法提供服务" : language == 2 ? "The driver's account has been frozen, unable to provide service" : "Le compte du conducteur a été bloqué et le service n’est pas disponible");
}
if(driver.getAuthState() == 4){
- return ResultUtil.error("司机信息未通过审核，无法提供服务");
+ return ResultUtil.error(language == 1 ? "司机信息未通过审核，无法提供服务" : language == 2 ? "Driver information has not passed the audit, unable to provide service" : "Les informations du conducteur n’ont pas été vérifiées et le service n’a pas pu être fourni");
}
if(driver.getState() == 1){
- return ResultUtil.error("司机还未上线，无法提供服务");
+ return ResultUtil.error(language == 1 ? "司机还未上线，无法提供服务" : language == 2 ? "The driver is not online and cannot provide service" : "Le chauffeur n’est pas en ligne et n’est pas en mesure d’offrir ses services");
}
if(driver.getState() == 3){
- return ResultUtil.error("司机正在服务中，无法提供服务");
+ return ResultUtil.error(language == 1 ? "司机正在服务中，无法提供服务" : language == 2 ? "The driver is in service and cannot provide service" : "Le chauffeur est en service et le service n’est pas disponible");
}
List<DriverService> query = driverServiceService.query(driverId, 1);
if(query.size() == 0){
- return ResultUtil.error("该司机不能服务此业务");
+ return ResultUtil.error(language == 1 ? "该司机不能服务此业务" : language == 2 ? "The driver cannot serve this service" : "Ce conducteur ne peut pas servir cette entreprise");
+ }
+
+ int count = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("driverId", driverId).eq("driverPay", 1).in("state", Arrays.asList(7, 8, 9)).eq("isDelete", 1));
+ if(count > 0){
+ return ResultUtil.error("司机未支付订单费用，无法进行接单");
+ }
+ 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("司机未支付订单费用，无法进行接单");
}
orderPrivateCar.setDriverId(driverId);
@@ -314,20 +336,6 @@
CarService query1 = carServiceMapper.query(1, driver.getCarId());
orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
orderPrivateCar.setSnatchOrderTime(new Date());
-
- //调用高德创建轨迹
-// String s = gdFalconUtil.selectTerminal(driver.getPhone());
-// String track = gdFalconUtil.createTrack(s);
-// orderPrivateCar.setTrackId(track);
-
- //调用移动的小号接口
- /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
- Region region = regionMapper.query(geocode1.get("districtCode"));*/
-// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), null);
-// if(String.valueOf(map.get("code")).equals("200")){
-// orderPrivateCar.setTelX(map.get("telX"));
-// orderPrivateCar.setBindId(map.get("bindId"));
-// }
driver.setState(3);
driverService.updateById(driver);
@@ -351,12 +359,12 @@
// TODO: 2021/5/11 修改，根据后台设定的派单范围查询范围内有无司机，将单子指派给距离最近的司机（距离相同随机取），范围内没有司机再进行推单流程
if(orderPrivateCar.getState() == 1){
- Company query = companyCityService.query(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+ Company query = companyCityService.query1(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
if(null == query){
- return ResultUtil.error("起点暂未企业提供服务");
+ return ResultUtil.error(language == 1 ? "起点暂未企业提供服务" : language == 2 ? "Starting point no enterprise to provide services" : "Point de départ pas encore disponible pour les entreprises");
}
AssignOrder assignOrder = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", query.getId()).eq("type", 1));
- if(null != assignOrder){//配置了指派规则才处理
+ if(null != assignOrder && assignOrder.getPeople() > 0){//配置了指派规则才处理
//获取空闲司机
List<Driver> drivers = driverService.queryIdleDriver(1, orderPrivateCar.getServerCarModelId(), orderPrivateCar.getStartLon(), orderPrivateCar.getStartLat(), assignOrder.getDistance(), null);//获取范围内空闲司机
if(drivers.size() > 0){//有司机，直接指派给司机
@@ -411,20 +419,6 @@
orderPrivateCar.setServerCarModelId(query1.getServerCarModelId());
orderPrivateCar.setSnatchOrderTime(new Date());
- //调用高德创建轨迹
-// String s = gdFalconUtil.selectTerminal(dr.getPhone());
-// String track = gdFalconUtil.createTrack(s);
-// orderPrivateCar.setTrackId(track);
-
- //调用移动的小号接口
- /* Map<String, String> geocode1 = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
- Region region = regionMapper.query(geocode1.get("districtCode"));*/
-// Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), dr.getPhone(), null);
-// if(String.valueOf(map.get("code")).equals("200")){
-// orderPrivateCar.setTelX(map.get("telX"));
-// orderPrivateCar.setBindId(map.get("bindId"));
-// }
-
dr.setState(3);
driverService.updateById(dr);
this.updateById(orderPrivateCar);
@@ -449,7 +443,9 @@
//添加消息
- systemNoticeService.addSystemNotice(1, "您的专车订单已下单成功，我们正在为您指派司机，请稍后！", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您的专车订单已下单成功，我们正在为您指派司机，请稍后！" :
+ language == 2 ? "Your private car order has been successfully placed, we are assigning a driver for you, please wait!" :
+ "Votre commande de voiture exclusive a été passée avec succès. Nous vous assignons un chauffeur. Plus tard!", orderPrivateCar.getUserId(), 1);
BaseWarpper baseWarpper = new BaseWarpper();
baseWarpper.setState(orderPrivateCar.getState());
@@ -465,13 +461,14 @@
* @throws Exception
*/
@Override
- public ResultUtil pushOrderPrivateCar(Integer id) throws Exception {
+ public ResultUtil pushOrderPrivateCar(Integer uid, Integer id, Integer language) throws Exception {
+ language = userInfoService.queryLanguage(uid, language);
OrderPrivateCar orderPrivateCar = this.selectById(id);
if(null == orderPrivateCar){
- return ResultUtil.error("推送订单失败，订单信息有误");
+ return ResultUtil.error(language == 1 ? "推送订单失败，订单信息有误" : language == 2 ? "Failed to push the order, the order information is wrong" : "Impossible de pousser la commande, les informations de commande sont erronées");
}
if(orderPrivateCar.getState() != 1){
- return ResultUtil.error("订单已被司机接单，不能重复推送");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，不能重复推送" : language == 2 ? "The order has been taken by the driver and cannot be pushed repeatedly" : "La commande a été prise par le chauffeur et ne peut pas être poussée à plusieurs reprises");
}
//处理摆渡订单的继续推单操作
if(orderPrivateCar.getType() == 2){
@@ -480,7 +477,7 @@
List<Map<String, Integer>> orders = new ArrayList<>();
for(OrderPrivateCar orderPrivateCar1 : list){
if(orderPrivateCar1.getState() != 1){
- return ResultUtil.error("订单已被司机接单，推单取消");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
}
Map<String, Integer> map = new HashMap<>();
map.put("orderType", 1);
@@ -490,7 +487,7 @@
List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for(OrderTaxi orderTaxi : list1){
if(orderTaxi.getState() != 1){
- return ResultUtil.error("订单已被司机接单，推单取消");
+ return ResultUtil.error(language == 1 ? "订单已被司机接单，推单取消" : language == 2 ? "The order has been taken by the driver, and the push order has been cancelled" : "La commande a été prise par le chauffeur et la commande push a été annulée");
}
Map<String, Integer> map = new HashMap<>();
map.put("orderType", 2);
@@ -514,8 +511,8 @@
}
double amount = 0;
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
- if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getArriveTime()!=null &&
- (orderPrivateCar.getArriveTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
+ if(null != orderPrivateCar.getDriverId() && orderPrivateCar.getSnatchOrderTime()!=null &&
+ (orderPrivateCar.getSnatchOrderTime().getTime() + query.getMinuteNum() * 60 * 1000) < new Date().getTime()){//收费的情况
if(null != query){
amount += query.getMoney();
}
@@ -526,7 +523,7 @@
}
@Override
- public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid) throws Exception {
+ public ResultUtil addCancle(Integer id, String reason, String remark, Integer uid, Integer language) throws Exception {
if(ToolUtil.isNotEmpty(remark)){
if(ToolUtil.isNotEmpty(remark)){
List<SensitiveWords> sensitiveWords = sensitiveWordsMapper.selectList(null);
@@ -536,31 +533,32 @@
}
}
+ language = userInfoService.queryLanguage(uid, language);
OrderPrivateCar orderPrivateCar = this.selectById(id);
Integer integer = null;
if(null == orderPrivateCar){
- return ResultUtil.error("取消订单失败，订单信息有误");
+ return ResultUtil.error(language == 1 ? "取消订单失败，订单信息有误" : language == 2 ? "Failed to cancel the order, the order information is incorrect" : "Échec de l'annulation de la commande, les informations de la commande sont incorrectes");
}
if(orderPrivateCar.getState() > 5 && orderPrivateCar.getState() != 11){
- return ResultUtil.error("取消订单失败，不合法的操作");
+ return ResultUtil.error(language == 1 ? "取消订单失败，不合法的操作" : language == 2 ? "Cancel order failed, illegal operation" : "Échec de l'annulation de la commande, opération illégale");
}
if(null == orderPrivateCar.getDriverId()){//没有接单的情况
if(orderPrivateCar.getType() == 2){//摆渡车
OrderCrossCityServiceImpl.pushEndMap.remove(orderPrivateCar.getCrossCityOrderId());//删除标识数据
List<OrderPrivateCar> list = this.selectList(new EntityWrapper<OrderPrivateCar>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for(OrderPrivateCar orderPrivateCar1 : list){
- orderCancelService.saveData(orderPrivateCar1.getId(), 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
+ orderCancelService.saveData(orderPrivateCar1.getId(), 1, language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", null, null, 2, 1, uid);
orderPrivateCar1.setState(10);
this.updateById(orderPrivateCar1);
}
List<OrderTaxi> list1 = orderTaxiService.selectList(new EntityWrapper<OrderTaxi>().eq("type", 2).eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId()).eq("place", orderPrivateCar.getPlace()));
for(OrderTaxi orderTaxi : list1){
- orderCancelService.saveData(orderTaxi.getId(), 2, "无司机接单", "无司机接单", null, null, 2, 1, uid);
+ orderCancelService.saveData(orderTaxi.getId(), 2, language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", null, null, 2, 1, uid);
orderTaxi.setState(10);
orderTaxiService.updateById(orderTaxi);
}
}else{
- integer = orderCancelService.saveData(id, 1, "无司机接单", "无司机接单", null, null, 2, 1, uid);
+ integer = orderCancelService.saveData(id, 1, language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", language == 1 ? "无司机接单" : language == 2 ? "No driver to take orders" : "Pas de chauffeur pour prendre les commandes", null, null, 2, 1, uid);
orderPrivateCar.setState(10);
this.updateById(orderPrivateCar);
}
@@ -592,23 +590,13 @@
driver.setState(2);
driverService.updateById(driver);
}else{
- return ResultUtil.error("请完善后台取消规则设置");
+ return ResultUtil.error(language == 1 ? "请完善后台取消规则设置" : language == 2 ? "Please improve the background cancellation rule settings" : "Veuillez améliorer les paramètres de la règle d'annulation en arrière-plan");
}
}
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
- //上传数据
- pushMinistryOfTransportUtil.orderCancel(orderPrivateCar.getId());
- }
- }
- }).start();
-
//添加消息
- systemNoticeService.addSystemNotice(1, "您已成功取消出行订单，谢谢使用！", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已成功取消出行订单，谢谢使用！" : language == 2 ? "You have successfully canceled the travel order, thank you for using" : "Vous avez annulé avec succès la commande de voyage, merci d'utiliser", orderPrivateCar.getUserId(), 1);
Map<String, Object> map = new HashMap<>();
map.put("id", integer);
return ResultUtil.success(map);
@@ -622,7 +610,7 @@
* @throws Exception
*/
@Override
- public ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, Integer cancleId, Integer type) throws Exception {
+ public ResultUtil cancleOrderPrivateCar(Integer id, Integer payType, String accountNumber, Integer cancleId, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
Integer uid = orderPrivateCar.getUserId();
UserInfo userInfo = userInfoService.selectById(uid);
@@ -643,33 +631,33 @@
CancleOrder query = cancleOrderService.query(orderPrivateCar.getOrderType(), 1, orderPrivateCar.getCompanyId());
if(null != query){
- if(payType == 1){//微信支付
+ if(payType == 1){//线上支付
orderCancel.setPayType(1);
orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.weixinpay("订单取消",id +"",id + "_1_fei",query.getMoney()+"","/base/wxCancelOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
- //Map<String, String> map = icbcPayUtil.placeAnOrder(id + ",1", 9, 5, uid.toString(), "订单取消", query.getMoney(), callbackPath + "/base/wxCancelOrderTaxi", "", type, userInfo.getAppletsOpenId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String merchantTransactionId = sdf.format(new Date()) + "1" + id;
+ CheckoutRequest checkoutRequest = new CheckoutRequest();
+ checkoutRequest.setMsisdn(Long.valueOf(userInfo.getPhone()));
+ checkoutRequest.setCustomerEmail(userInfo.getEmail());
+ checkoutRequest.setAccountNumber(accountNumber);
+ checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
+ checkoutRequest.setCustomerLastName(userInfo.getLastName());
+ checkoutRequest.setRequestAmount(query.getMoney());
+ checkoutRequest.setMerchantTransactionId(merchantTransactionId);
+ checkoutRequest.setRequestDescription("Cancel a trip");
+ checkoutRequest.setCallbackUrl(callbackPath + "/base/wxCancelOrderTaxi");
+ checkoutRequest.setPendingRedirectUrl("");
+ checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
+ checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, id, 1, 1, query.getMoney(), null, 1);//添加预支付数据
- resultUtil = resultUtil;
- }else{
- resultUtil = ResultUtil.error("支付失败", "");
}
}
- if(payType == 2){//支付宝支付
- orderCancel.setPayType(2);
- orderCancelService.updateById(orderCancel);
- resultUtil = payMoneyUtil.alipay("订单取消","订单取消",id + "_1_fei",query.getMoney()+"","/base/aliCancelOrderTaxi");
- if(resultUtil.getCode()==200){
- paymentRecordService.saveData(1, null, null, id, 1, 2, query.getMoney(), null, 1);//添加预支付数据
- resultUtil = resultUtil;
- }else{
- resultUtil = ResultUtil.error("支付失败", "");
- }
- }
if(payType == 3){//余额支付
if(userInfo.getBalance() != null && userInfo.getBalance() < query.getMoney()){
- return ResultUtil.error("余额不足，无法完成支付", "");
+ return ResultUtil.error((language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant"), "");
}
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(query.getMoney())).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -706,15 +694,10 @@
this.deleteTask(id);//删除定时任务
-// new Thread(new Runnable() {
-// @Override
-// public void run() {
-// pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
-// }
-// }).start();
-
//添加消息
- systemNoticeService.addSystemNotice(1, "您已使用余额成功支付取消订单费用，谢谢使用！", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功支付取消订单费用，谢谢使用！" : language == 2
+ ? "You have successfully paid the cancellation fee with the balance, thank you for using!"
+ : "Vous avez utilisé le solde pour payer avec succès les frais d’annulation de commande. Merci d’utiliser!", orderPrivateCar.getUserId(), 1);
}
}
return resultUtil;
@@ -737,7 +720,7 @@
if(ToolUtil.isNotEmpty(vehicle)){
integers = JSON.parseArray(vehicle).toJavaList(Integer.class);
}
- Company query = companyCityService.query(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
+ Company query = companyCityService.query1(String.valueOf(orderPrivateCar.getStartLon()), String.valueOf(orderPrivateCar.getStartLat()));//获取起点所属分公司
List<PushOrder> querys = pushOrderService.querys(null, 1, query.getId());//获取需要推送的次数
for(int i = 1; i <= querys.size(); i++){
PushOrder pushOrder = pushOrderService.querys(i, 1, query.getId()).get(0);
@@ -767,8 +750,11 @@
break;
}
if(i == querys.size() && state == 1){
- pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
- orderIds.remove(orderPrivateCar.getId());
+ OrderPrivateCar orderPrivateCar1 = OrderPrivateCarServiceImpl.this.selectById(orderPrivateCar.getId());
+ if(orderPrivateCar1.getState() == 1){
+ pushUtil.pushEndPush(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1);
+ orderIds.remove(orderPrivateCar.getId());
+ }
}
}
} catch (Exception e) {
@@ -828,18 +814,18 @@
}
@Override
- public ResultUtil payPrivateCarOrder(Integer payType, Integer orderId, Integer couponId, Integer type) throws Exception {
+ public ResultUtil payPrivateCarOrder(Integer payType, String accountNumber, Integer orderId, Integer couponId, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 8 || orderPrivateCar.getState() == 9){
- return ResultUtil.error("订单已完成支付，不允许重复支付", "");
+ return ResultUtil.error("订单已完成支付，不允许重复支付");
}
if(orderPrivateCar.getState() != 7){
- return ResultUtil.error("订单不在待支付状态，不允许支付", "");
+ return ResultUtil.error("订单不在待支付状态，不允许支付");
}
Integer uid = orderPrivateCar.getUserId();
Double orderMoney = orderPrivateCar.getOrderMoney();
UserInfo userInfo = userInfoService.selectById(uid);
- ResultUtil resultUtil = ResultUtil.success(new HashMap<>());
+ ResultUtil resultUtil = ResultUtil.success();
orderPrivateCar.setCouponMoney(0D);//初始化历史数据
orderPrivateCar.setCouponId(null);
@@ -848,19 +834,19 @@
if(null != couponId){
userCouponRecord = userCouponRecordService.selectById(couponId);
if(userCouponRecord.getCompanyId() != orderPrivateCar.getCompanyId()){
- return ResultUtil.error("优惠券不能用于此订单", "");
+ return ResultUtil.error("优惠券不能用于此订单");
}
if(userCouponRecord.getState() == 2){
- return ResultUtil.error("优惠券已使用", "");
+ return ResultUtil.error("优惠券已使用");
}
if(userCouponRecord.getState() == 3){
- return ResultUtil.error("优惠券已过期", "");
+ return ResultUtil.error("优惠券已过期");
}
if(userCouponRecord.getCouponUseType() != 0 && userCouponRecord.getCouponUseType() != 1){
- return ResultUtil.error("优惠券不能用于此类型订单", "");
+ return ResultUtil.error("优惠券不能用于此类型订单");
}
if(userCouponRecord.getCouponType() == 2 && orderMoney.compareTo(userCouponRecord.getFullMoney()) < 0){
- return ResultUtil.error("优惠券不能用于此订单", "");
+ return ResultUtil.error("优惠券不能用于此订单");
}
orderMoney = orderMoney - userCouponRecord.getMoney();
orderPrivateCar.setCouponMoney(userCouponRecord.getMoney());
@@ -893,30 +879,34 @@
}
if(payType == 1){//手机支付
- //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 9, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/wxPayOrderTaxi", "", type, userInfo.getAppletsOpenId());
- resultUtil = payMoneyUtil.weixinpay("完成订单",orderId +"",orderId + "_1_fei",orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String merchantTransactionId = sdf.format(new Date()) + "1" + language + orderId;
+// resultUtil = payMoneyUtil.weixinpay("完成订单",language.toString(),orderId + "_1_fei",orderMoney+"","/base/wxPayOrderTaxi","JSAPI",userInfo.getAppletsOpenId());
+ CheckoutRequest checkoutRequest = new CheckoutRequest();
+ checkoutRequest.setMsisdn(Long.valueOf(userInfo.getPhone()));
+ checkoutRequest.setCustomerEmail(userInfo.getEmail());
+ checkoutRequest.setAccountNumber(accountNumber);
+ checkoutRequest.setCustomerFirstName(userInfo.getFirstName());
+ checkoutRequest.setCustomerLastName(userInfo.getLastName());
+ checkoutRequest.setRequestAmount(orderMoney);
+ checkoutRequest.setMerchantTransactionId(merchantTransactionId);
+ checkoutRequest.setRequestDescription("Travel completion payment");
+ checkoutRequest.setCallbackUrl(callbackPath + "/base/wxPayOrderTaxi");
+ checkoutRequest.setPendingRedirectUrl("");
+ checkoutRequest.setSuccessRedirectUrl("https://10pz685243.zicp.fun");
+ checkoutRequest.setFailRedirectUrl("https://www.baidu.com");
+ resultUtil = TinggPayUtil.checkoutRequest(checkoutRequest);
if(resultUtil.getCode()==200){
paymentRecordService.saveData(1, null, null, orderId, 1, 1, orderMoney, null, 1);//添加预支付数据
- resultUtil = resultUtil;
}else{
- resultUtil = ResultUtil.error("支付失败", "");
+ resultUtil = ResultUtil.error("支付失败");
}
}
- if(payType == 2) {//银行卡支付
- resultUtil = payMoneyUtil.alipay("完成订单","完成订单",orderId + "_1_fei",orderMoney+"","/base/aliPayOrderTaxi");
- //Map<String, String> map = icbcPayUtil.placeAnOrder(orderId + ",1", 10, 5, uid.toString(), "完成订单", orderMoney, callbackPath + "/base/aliPayOrderTaxi", "", type, null);
- if (resultUtil.getCode()==200) {
- paymentRecordService.saveData(1, null, null, orderId, 1, 2, orderMoney, null, 1);//添加预支付数据
- resultUtil = resultUtil;
- } else {
- resultUtil = ResultUtil.error("支付失败", "");
- }
- }
if(payType == 3){//余额支付
if(userInfo.getBalance() == null || userInfo.getBalance() < orderMoney){
- return ResultUtil.error("余额不足，无法完成支付", "");
+ return ResultUtil.error(language == 1 ? "账户余额不足" : language == 2 ? "Insufficient account balance" : "Solde de compte insuffisant");
}
userInfo.setBalance(new BigDecimal(userInfo.getBalance()).subtract(new BigDecimal(orderMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
@@ -956,7 +946,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
- 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(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -968,6 +958,113 @@
driverService.updateById(driver);
}
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receipt.html";
+ 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");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+ Car car = carMapper.selectById(orderPrivateCar.getCarId());
+ Double aDouble = 0D;
+ if(null != orderPrivateCar.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+ }
+ Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("余额");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
+ Element lc_chinese = document.getElementById("lc_chinese");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ Element start_time_chinese = document.getElementById("start_time_chinese");
+ start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderPrivateCar.getStartAddress());
+ Element end_time_chinese = document.getElementById("end_time_chinese");
+ end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderPrivateCar.getEndAddress());
+ }
+ if(2 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_english = document.getElementById("title_english");
+ title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ Element xcf_english = document.getElementById("xcf_english");
+ xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("balance");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
+ Element lc_english = document.getElementById("lc_english");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ Element start_time_english = document.getElementById("start_time_english");
+ start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderPrivateCar.getStartAddress());
+ Element end_time_english = document.getElementById("end_time_english");
+ end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderPrivateCar.getEndAddress());
+ }
+ if(3 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ Element title_french = document.getElementById("title_french");
+ title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ Element xcf_french = document.getElementById("xcf_french");
+ xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("Le solde");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Évaluation des pilotes: " + aDouble);
+ Element lc_french = document.getElementById("lc_french");
+ lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ Element start_time_french = document.getElementById("start_time_french");
+ start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderPrivateCar.getStartAddress());
+ Element end_time_french = document.getElementById("end_time_french");
+ end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderPrivateCar.getEndAddress());
+ }
+
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ }
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -978,7 +1075,9 @@
}
}).start();
- systemNoticeService.addSystemNotice(1, "您已使用余额成功完成出行订单支付，谢谢使用！", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用余额成功完成出行订单支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the payment of travel order with the balance, thank you for using!"
+ : "Vous avez utilisé le solde pour compléter le paiement de la commande de voyage avec succès. Merci d’utiliser!", uid, 1);
}
@@ -1019,7 +1118,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
- 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(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -1031,6 +1130,113 @@
driverService.updateById(driver);
}
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receipt.html";
+ 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");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+ Car car = carMapper.selectById(orderPrivateCar.getCarId());
+ Double aDouble = 0D;
+ if(null != orderPrivateCar.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+ }
+ Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("现金");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
+ Element lc_chinese = document.getElementById("lc_chinese");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ Element start_time_chinese = document.getElementById("start_time_chinese");
+ start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderPrivateCar.getStartAddress());
+ Element end_time_chinese = document.getElementById("end_time_chinese");
+ end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderPrivateCar.getEndAddress());
+ }
+ if(2 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_english = document.getElementById("title_english");
+ title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ Element xcf_english = document.getElementById("xcf_english");
+ xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("Cash");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
+ Element lc_english = document.getElementById("lc_english");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ Element start_time_english = document.getElementById("start_time_english");
+ start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderPrivateCar.getStartAddress());
+ Element end_time_english = document.getElementById("end_time_english");
+ end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderPrivateCar.getEndAddress());
+ }
+ if(3 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ Element title_french = document.getElementById("title_french");
+ title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ Element xcf_french = document.getElementById("xcf_french");
+ xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("espèces");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Évaluation des pilotes: " + aDouble);
+ Element lc_french = document.getElementById("lc_french");
+ lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ Element start_time_french = document.getElementById("start_time_french");
+ start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderPrivateCar.getStartAddress());
+ Element end_time_french = document.getElementById("end_time_french");
+ end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderPrivateCar.getEndAddress());
+ }
+
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ }
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@@ -1038,22 +1244,16 @@
public void run() {
pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
pushUtil.pushOrderState(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1, orderPrivateCar.getState(), 0);
+ pushUtil.pushOfflinePayment(2, orderPrivateCar.getDriverId(), orderPrivateCar.getId(), 1);
}
}).start();
- systemNoticeService.addSystemNotice(1, "您已使用现金成功完成出行订单支付，谢谢使用！", uid, 1);
+ systemNoticeService.addSystemNotice(1, language == 1 ? "您已使用现金成功完成出行订单支付，谢谢使用！" : language == 2
+ ? "You have successfully completed the payment of travel order with cash, thank you for using!"
+ : "Vous avez utilisé de l’argent pour compléter avec succès le paiement de votre commande de voyage. Merci d’utiliser!", uid, 1);
}
this.updateAllColumnById(orderPrivateCar);
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.operatePay(orderId);
- }
- }
- }).start();
return resultUtil;
}
@@ -1107,7 +1307,7 @@
}
@Override
- public synchronized ResultUtil shareRedEnvelope(Integer orderId) throws Exception {
+ public synchronized ResultUtil shareRedEnvelope(Integer orderId, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
UserRedPacketRecord query = userRedPacketRecordService.query_(orderPrivateCar.getUserId(), orderPrivateCar.getCompanyId(), 0, 1, null);
if(null != query){
@@ -1131,6 +1331,40 @@
query.setState(1);
query.setRedPacketActivityId(id.getId());
userRedPacketRecordService.updateById(query);
+
+ UserInfo userInfo = userInfoService.selectById(orderPrivateCar.getUserId());
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/redEnvelopes.html";
+ Document document = Jsoup.parse(new File(path), "UTF-8");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element user_chinese = document.getElementById("user_chinese");
+ user_chinese.text("您好 " + userInfo.getNickName() + "，");
+ Element time_chinese = document.getElementById("time_chinese");
+ time_chinese.text("此活动有效期在" + sdf.format(query.getInsertTime()) + "至" + sdf.format(query.getEndTime()) + "，详情请查看I-GO平台");
+ }
+ if(2 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element user_english = document.getElementById("user_english");
+ user_english.text("Hello " + userInfo.getNickName() + "，");
+ Element time_english = document.getElementById("time_english");
+ time_english.text("You could use it from" + sdf.format(query.getInsertTime()) + "to" + sdf.format(query.getEndTime()) + "，check more details on the app.");
+ }
+ if(3 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ Element user_french = document.getElementById("user_french");
+ user_french.text("Bonjour " + userInfo.getNickName() + "，");
+ Element time_french = document.getElementById("time_french");
+ time_french.text("Cette promotion est valable du" + sdf.format(query.getInsertTime()) + "au" + sdf.format(query.getEndTime()) + ". Veuillez consulter la plateforme i-go pour plus de détails.");
+ }
+
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "红包活动" : language == 2 ? "Red envelope activity" : "Activité de l’enveloppe rouge", document.html());
+ }
+
}
return ResultUtil.success();
}
@@ -1199,7 +1433,7 @@
}
@Override
- public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type) throws Exception {
+ public void payOrderPrivateCarCallback(Integer id, String order_id, Integer type, Integer language) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(id);
PaymentRecord query = paymentRecordService.query(1, null, null, Integer.valueOf(id), 1, type, 1);
if(null != query){
@@ -1246,7 +1480,7 @@
}
if(company.getIsSpeFixedOrProportional() == 1){//比例
Double price = orderPrivateCar.getStartMoney() + orderPrivateCar.getMileageMoney() + orderPrivateCar.getWaitMoney() + orderPrivateCar.getDurationMoney() + orderPrivateCar.getLongDistanceMoney();
- d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ d = new BigDecimal(price).multiply(new BigDecimal(taxi).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)));
c = new BigDecimal(orderPrivateCar.getOrderMoney()).subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN);
}
incomeService.saveData(1, orderPrivateCar.getCompanyId(), 2, orderPrivateCar.getId(), 1, d.doubleValue());
@@ -1257,6 +1491,115 @@
driver.setBalance(new BigDecimal(null != driver.getBalance() ? driver.getBalance() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
driverService.updateById(driver);
}
+
+
+ if(ToolUtil.isNotEmpty(userInfo.getEmail())){
+ String path = templatePath + "user/receipt.html";
+ 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");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("HH:mm");
+ Car car = carMapper.selectById(orderPrivateCar.getCarId());
+ Double aDouble = 0D;
+ if(null != orderPrivateCar.getDriverId()){
+ aDouble = orderEvaluateService.queryDriverScore(orderPrivateCar.getDriverId());
+ }
+ Double aDouble1 = Double.valueOf(orderPrivateCar.getMileage() / 1000);
+ if(1 == language){
+ document.getElementById("english").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_chinese = document.getElementById("title_chinese");
+ title_chinese.text(sdf.format(orderPrivateCar.getTravelTime()) + "，您在I-GO1个订单消费GHS " + orderPrivateCar.getPayMoney());
+ Element xcf_chinese = document.getElementById("xcf_chinese");
+ xcf_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_chinese = document.getElementById("xj_chinese");
+ xj_chinese.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_chinese = document.getElementById("pay_type_chinese");
+ pay_type_chinese.text("现金");
+ Element pay_money_chinese = document.getElementById("pay_money_chinese");
+ pay_money_chinese.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_chinese = document.getElementById("pay_time_chinese");
+ pay_time_chinese.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_chinese = document.getElementById("cp_chinese");
+ cp_chinese.text("车牌：" + car.getCarLicensePlate());
+ Element pf_chinese = document.getElementById("pf_chinese");
+ pf_chinese.text("司机评分：" + aDouble);
+ Element lc_chinese = document.getElementById("lc_chinese");
+ lc_chinese.text("里程：" + aDouble1 + "公里 /" + orderPrivateCar.getDuration() + "分钟");
+ Element start_time_chinese = document.getElementById("start_time_chinese");
+ start_time_chinese.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_chinese = document.getElementById("start_address_chinese");
+ start_address_chinese.text(orderPrivateCar.getStartAddress());
+ Element end_time_chinese = document.getElementById("end_time_chinese");
+ end_time_chinese.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_chinese = document.getElementById("end_address_chinese");
+ end_address_chinese.text(orderPrivateCar.getEndAddress());
+ }
+ if(2 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("french").attr("style", "display: none;");
+ Element title_english = document.getElementById("title_english");
+ title_english.text(sdf.format(orderPrivateCar.getTravelTime()) + "，You spent GHS " + orderPrivateCar.getPayMoney() + " on the trip ");
+ Element xcf_english = document.getElementById("xcf_english");
+ xcf_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_english = document.getElementById("xj_english");
+ xj_english.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_english = document.getElementById("pay_type_english");
+ pay_type_english.text("Cash");
+ Element pay_money_english = document.getElementById("pay_money_english");
+ pay_money_english.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_english = document.getElementById("pay_time_english");
+ pay_time_english.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_english = document.getElementById("cp_english");
+ cp_english.text("Number Plate：" + car.getCarLicensePlate());
+ Element pf_english = document.getElementById("pf_english");
+ pf_english.text("Driver Rating：" + aDouble);
+ Element lc_english = document.getElementById("lc_english");
+ lc_english.text("Mileage：" + aDouble1 + "KM / " + orderPrivateCar.getDuration() + "Minutes");
+ Element start_time_english = document.getElementById("start_time_english");
+ start_time_english.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_english = document.getElementById("start_address_english");
+ start_address_english.text(orderPrivateCar.getStartAddress());
+ Element end_time_english = document.getElementById("end_time_english");
+ end_time_english.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_english = document.getElementById("end_address_english");
+ end_address_english.text(orderPrivateCar.getEndAddress());
+ }
+ if(3 == language){
+ document.getElementById("chinese").attr("style", "display: none;");
+ document.getElementById("english").attr("style", "display: none;");
+ Element title_french = document.getElementById("title_french");
+ title_french.text("Vous consommez GHS " + orderPrivateCar.getPayMoney() + " sur votre commande i-go1 le " + sdf.format(orderPrivateCar.getTravelTime()));
+ Element xcf_french = document.getElementById("xcf_french");
+ xcf_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element xj_french = document.getElementById("xj_french");
+ xj_french.text("GHS " + orderPrivateCar.getOrderMoney());
+ Element pay_type_french = document.getElementById("pay_type_french");
+ pay_type_french.text("espèces");
+ Element pay_money_french = document.getElementById("pay_money_french");
+ pay_money_french.text("GHS " + orderPrivateCar.getPayMoney());
+ Element pay_time_french = document.getElementById("pay_time_french");
+ pay_time_french.text(sdf1.format(orderPrivateCar.getEndServiceTime()));
+ Element cp_french = document.getElementById("cp_french");
+ cp_french.text("Plaque d’immatriculation：" + car.getCarLicensePlate());
+ Element pf_french = document.getElementById("pf_french");
+ pf_french.text("Évaluation des pilotes: " + aDouble);
+ Element lc_french = document.getElementById("lc_french");
+ lc_french.text("Kilométrage: " + aDouble1 + "km / " + orderPrivateCar.getDuration() + "minutes");
+ Element start_time_french = document.getElementById("start_time_french");
+ start_time_french.text(sdf2.format(orderPrivateCar.getTravelTime()));
+ Element start_address_french = document.getElementById("start_address_french");
+ start_address_french.text(orderPrivateCar.getStartAddress());
+ Element end_time_french = document.getElementById("end_time_french");
+ end_time_french.text(sdf2.format(orderPrivateCar.getEndServiceTime()));
+ Element end_address_french = document.getElementById("end_address_french");
+ end_address_french.text(orderPrivateCar.getEndAddress());
+ }
+
+ EmailUtil.send(userInfo.getEmail(), language == 1 ? "专车收据" : language == 2 ? "Private car receipt" : "Reçu de voiture privée", document.html());
+ }
+
+
// TODO: 2020/5/24 这里需要给司机和用户推送订单状态
new Thread(new Runnable() {
@Override
@@ -1366,15 +1709,17 @@
}
String lnt = (null != value ? value.split(",")[0] : "0.0");
- String lat = (null != value ? value.split(",")[0] : "0.0");
+ String lat = (null != value ? value.split(",")[1] : "0.0");
DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(orderPrivateCar.getStartLat(), orderPrivateCar.getStartLon(), Double.valueOf(lat), Double.valueOf(lnt));
String d = "0";
String t = "0";
if(null == distancematrix){
System.err.println("查询距离出错了");
+ }else if(distancematrix.getDistance() == 0){
+ System.err.println("未获取到有效的距离");
}else{
- d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
- t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
+ d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
}
OrderServerWarpper orderServerWarpper = new OrderServerWarpper();
orderServerWarpper.setOrderId(orderPrivateCar.getId());
@@ -1395,9 +1740,11 @@
distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(lat), Double.valueOf(lnt), orderPrivateCar.getEndLat(), orderPrivateCar.getEndLon());
if(null == distancematrix){
System.err.println("查询距离出错了");
+ }else if(distancematrix.getDistance() == 0){
+ System.err.println("未获取到有效的距离");
}else{
- d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_EVEN).toString();
- t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60)).setScale(2, BigDecimal.ROUND_HALF_EVEN).intValue() + "";
+ d = new BigDecimal(distancematrix.getDistance()).divide(new BigDecimal(1000), new MathContext(2, RoundingMode.HALF_EVEN)).toString();
+ t = new BigDecimal(distancematrix.getDuration()).divide(new BigDecimal(60), new MathContext(2, RoundingMode.HALF_EVEN)).intValue() + "";
}
orderServerWarpper.setReservationMileage("0");
orderServerWarpper.setReservationTime("0");
--
Gitblit v1.7.1