From 53562814add61acfdc02d6b25dae6324f6fd5f92 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 18 五月 2023 16:38:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 148 +++++++++++++++++++------------------------------
1 files changed, 57 insertions(+), 91 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index ef646b4..91b96f2 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.specialTrain.dao.OrderPrivateCarMapper;
import com.stylefeng.guns.modular.specialTrain.model.OrderPrivateCar;
import com.stylefeng.guns.modular.specialTrain.server.IOrderPrivateCarService;
@@ -24,6 +25,8 @@
import java.io.FileWriter;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.math.MathContext;
+import java.math.RoundingMode;
import java.util.*;
@@ -64,13 +67,7 @@
private GDMapElectricFenceUtil gdMapElectricFenceUtil;
@Autowired
- private PushMinistryOfTransportUtil pushMinistryOfTransportUtil;
-
- @Autowired
private IOrderTaxiService orderTaxiService;
-
- @Value("${pushMinistryOfTransport}")
- private boolean pushMinistryOfTransport;
@Resource
@@ -220,18 +217,6 @@
systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单，请及时联系客户！", orderPrivateCar.getDriverId());
systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId());
-
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){
- //上传数据
- pushMinistryOfTransportUtil.orderCreate(orderId);
- pushMinistryOfTransportUtil.orderMatch(orderId);
- }
- }
- }).start();
-
return ResultUtil.success();
}
@@ -260,12 +245,12 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address,String phone) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- if(state==5){
- UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
- if(!userInfo.getPhone().substring(7, userInfo.getPhone().length()).equals(phone)){
- return ResultUtil.error("手机号错误");
- }
- }
+// if(state==5){
+// UserInfo userInfo = userInfoMapper.selectById(orderPrivateCar.getUserId());
+// if(!userInfo.getPhone().substring(7, userInfo.getPhone().length()).equals(phone)){
+// return ResultUtil.error("手机号错误");
+// }
+// }
if(state==3 && orderPrivateCar.getState()!=2){
return ResultUtil.error("当前订单不能触发前往预约地点");
}
@@ -296,14 +281,6 @@
pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);//主动推送司机定位
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传数据
- pushMinistryOfTransportUtil.operateDepart(orderId);
- }
- }
- }).start();
OrderPosition orderPosition = new OrderPosition();
orderPosition.setOrderId(orderId);
orderPosition.setOrderType(1);
@@ -393,7 +370,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());
@@ -442,19 +419,6 @@
pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
}
}).start();
-
- OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传交通数据
- pushMinistryOfTransportUtil.baseInfoVehicleTotalMile(finalOrderPrivateCar.getCarId());
- pushMinistryOfTransportUtil.operateArrive(orderId);
- }
- }
- }).start();
-
-
return ResultUtil.success();
}
@@ -590,54 +554,56 @@
//夜间服务处理逻辑
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
- s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
+ if(ToolUtil.isNotEmpty(num16)){
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[0].split(":")[0]));
+ s.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[0].split(":")[1]));
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num16.split(" - ")[1].split(":")[0]));
+ e.set(Calendar.MINUTE, Integer.valueOf(num16.split(" - ")[1].split(":")[1]));
- if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(d > num8.doubleValue() && d <= num9.doubleValue()){
- yt1 = num20 * (d - num8);
+ if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num20 * (d - num8);
+ }
+ if(d > num9.doubleValue()){
+ yt1 = num20 * (num9 - num8);
+ }
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num21 * (d - num11);
+ }
+ if(d > num12.doubleValue()){
+ yt2 = num21 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num22 * (d - num14);
+ }
+ amount = num17 + (d1 * num18) + (t1 * num19) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartMoney(num17);//起步价
+ orderPrivateCar.setStartDuration((int)(num3.doubleValue()));
+ orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num18).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
+ orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num19).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
+ orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setWaitMoney(new BigDecimal(w1 * num7).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
+ orderPrivateCar.setLongDistance(new BigDecimal((d > num8) ? d - num8 : 0).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setLongDistanceMoney(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//远途费
+ orderPrivateCar.setParkMoney(parkingFee);//停车费
+ orderPrivateCar.setRoadTollMoney(crossingFee);//过路费
+ orderPrivateCar.setRedPacketMoney(0D);//红包抵扣
+ orderPrivateCar.setCouponMoney(0D);//优惠券抵扣
+ orderPrivateCar.setDiscount(0D);//优惠抵扣
+ orderPrivateCar.setPayMoney(0D);//支付金额
+ orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMoneyType(2);
+ orderPrivateCar.setMoneyTime(num16);
+ return orderPrivateCar;
}
- if(d > num9.doubleValue()){
- yt1 = num20 * (num9 - num8);
- }
- if(d > num11.doubleValue() && d <= num12.doubleValue()){
- yt2 = num21 * (d - num11);
- }
- if(d > num12.doubleValue()){
- yt2 = num21 * (num12 - num11);
- }
- if(d > num14.doubleValue()){
- yt3 = num22 * (d - num14);
- }
- amount = num17 + (d1 * num18) + (t1 * num19) + (w1 * num7) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(num2);
- orderPrivateCar.setStartMoney(num17);//起步价
- orderPrivateCar.setStartDuration((int)(num3.doubleValue()));
- orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num18).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
- orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num19).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
- orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * num7).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > num8) ? d - num8 : 0).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setLongDistanceMoney(new BigDecimal(yt1 + yt2 + yt3).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//远途费
- orderPrivateCar.setParkMoney(parkingFee);//停车费
- orderPrivateCar.setRoadTollMoney(crossingFee);//过路费
- orderPrivateCar.setRedPacketMoney(0D);//红包抵扣
- orderPrivateCar.setCouponMoney(0D);//优惠券抵扣
- orderPrivateCar.setDiscount(0D);//优惠抵扣
- orderPrivateCar.setPayMoney(0D);//支付金额
- orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMoneyType(2);
- orderPrivateCar.setMoneyTime(num16);
- return orderPrivateCar;
}
--
Gitblit v1.7.1