From e52227b01983146f2e3c81dc575141d8b9889497 Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 10:16:30 +0800
Subject: [PATCH] 代码调整
---
DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java | 818 +++++++++++-----------------------------------------------
1 files changed, 157 insertions(+), 661 deletions(-)
diff --git a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index d2d2f21..e4521e0 100644
--- a/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/DriverTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1,18 +1,22 @@
package com.stylefeng.guns.modular.specialTrain.server.impl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
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;
+import com.stylefeng.guns.modular.system.dao.CarServiceMapper;
import com.stylefeng.guns.modular.system.dao.RegionMapper;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
-import com.stylefeng.guns.modular.system.model.*;
-import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.model.CarService;
+import com.stylefeng.guns.modular.system.model.Driver;
+import com.stylefeng.guns.modular.system.model.OrderPosition;
+import com.stylefeng.guns.modular.system.model.Region;
+import com.stylefeng.guns.modular.system.service.IDriverService;
+import com.stylefeng.guns.modular.system.service.IOrderPositionService;
+import com.stylefeng.guns.modular.system.service.ISystemNoticeService;
import com.stylefeng.guns.modular.system.util.*;
import com.stylefeng.guns.modular.taxi.model.OrderTaxi;
import com.stylefeng.guns.modular.taxi.service.IOrderTaxiService;
@@ -70,14 +74,8 @@
@Autowired
private GeodesyUtil geodesyUtil;
- @Autowired
- private IOrderAdditionalFeeService orderAdditionalFeeService;
-
- @Autowired
- private IAdditionalFeeService additionalFeeService;
-
- @Autowired
- private ICompanyService companyService;
+ @Resource
+ private CarServiceMapper carServiceMapper;
@Value("${pushMinistryOfTransport}")
private boolean pushMinistryOfTransport;
@@ -178,12 +176,19 @@
orderPrivateCar.setTrackId(track);
//调用移动的小号接口
- Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), (System.currentTimeMillis() + 86400000));
- if(String.valueOf(map.get("code")).equals("200")){
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(orderPrivateCar.getStartLon().toString(), orderPrivateCar.getStartLat().toString());
+ Region region = regionMapper.query(geocode.get("districtCode"));
+ Map<String, String> map = chinaMobileUtil.midAxbBindSend(orderPrivateCar.getPassengersPhone(), driver.getPhone(), Integer.valueOf(region.getCitycode().substring(1)));
+ if(String.valueOf(map.get("code")).equals("200")){
orderPrivateCar.setTelX(map.get("telX"));
orderPrivateCar.setBindId(map.get("bindId"));
}
+ //智慧屏订单
+ if(orderPrivateCar.getOrderSource() == 6){
+ CarService query = carServiceMapper.query(1, driver.getCarId());
+ orderPrivateCar.setServerCarModelId(query.getServerCarModelId());
+ }
this.updateById(orderPrivateCar);
//处理摆渡车的情况
@@ -195,7 +200,7 @@
.eq("userId", orderPrivateCar.getUserId())
.ne("state", 1)
.eq("crossCityOrderId", orderPrivateCar.getCrossCityOrderId())
- .eq("place", orderPrivateCar.getPlace()).ne("id", orderPrivateCar.getId())
+ .eq("place", orderPrivateCar.getPlace())
);
List<OrderTaxi> list1 = orderTaxiService.selectList(
new EntityWrapper<OrderTaxi>()
@@ -241,8 +246,8 @@
}
}).start();
- systemNoticeService.addSystemNotice(2, "您已成功抢得快车订单，请及时联系客户！", orderPrivateCar.getDriverId(), 1);
- systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(2, "您已成功抢得专车订单，请及时联系客户！", orderPrivateCar.getDriverId());
+ systemNoticeService.addSystemNotice(1, "您的订单已指派给" + driver.getName().substring(0, 1) + "师傅，请保持电话畅通！", orderPrivateCar.getUserId());
new Thread(new Runnable() {
@Override
@@ -259,8 +264,6 @@
}
- @Autowired
- private RedisUtil redisUtil;
/**
* 获取订单详情页（服务中的页面）
@@ -270,106 +273,10 @@
*/
@Override
public Map<String, Object> queryOrderInfo(Integer orderId) throws Exception {
- List<Map<String, Object>> orders = new ArrayList<>();
-
- OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
- if(orderPrivateCar.getPid()==null){
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderId,4,null,null);
- if(order!=null){
- orders.addAll(order);
- }
- String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
- order = this.baseMapper.queryOrderInfo(orderId,5,value.split(",")[0],value.split(",")[1]);
- if(order!=null){
- orders.addAll(order);
- }
-
- order = this.baseMapper.queryOrderInfo(orderId,6,null,null);
- if(order!=null){
- orders.addAll(order);
- }
- }else{
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),4,null,null);
- if(order!=null){
- orders.addAll(order);
- }
- String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
- order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),5,value.split(",")[0],value.split(",")[1]);
- if(order!=null){
- orders.addAll(order);
- }
-
- order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),6,null,null);
- if(order!=null){
- orders.addAll(order);
- }
- }
-
-
- Map<String, Object> map = new HashMap<>();
- map.put("line", "");
- map.put("peopleNumber", 0);
- map.put("orderNumber","");
- map.put("totalMoney", 0d);
- map.put("serverMoney", 0d);
- map.put("emergencyCall", "110");
- map.put("orders", JSON.toJSONString(orders));
- return map;
- //return orderPrivateCarMapper.queryOrderInfo(orderId);
+ return orderPrivateCarMapper.queryOrderInfo(orderId);
}
- @Override
- public Map<String, Object> queryOrderInfo2(Integer orderId) throws Exception {
- /*List<Map<String, Object>> orders = new ArrayList<>();
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderId,4,null,null);
- if(order!=null){
- orders.addAll(order);
- }
- OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
- String value = redisUtil.getValue("DRIVER" + String.valueOf(orderPrivateCar.getDriverId()));
- order = this.baseMapper.queryOrderInfo(orderId,5,value.split(",")[0],value.split(",")[1]);
- if(order!=null){
- orders.addAll(order);
- }
-
- order = this.baseMapper.queryOrderInfo(orderId,6,null,null);
- if(order!=null){
- orders.addAll(order);
- }
-
- Map<String, Object> map = new HashMap<>();
- map.put("line", "");
- map.put("peopleNumber", 0);
- map.put("orderNumber","");
- map.put("totalMoney", 0d);
- map.put("serverMoney", 0d);
- map.put("emergencyCall", "110");
- map.put("orders", JSON.toJSONString(orders));
- return map;*/
- Map<String,Object> map = orderPrivateCarMapper.queryOrderInfo2(orderId);
- OrderPrivateCar orderPrivateCar = this.baseMapper.selectById(orderId);
- Integer canOperation=1;
- if(orderPrivateCar.getState()<5){
- if(orderPrivateCar.getPid()==null) {
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderId, 4, null, null);
- if (order != null && order.size()>0) {
- if(!order.get(0).get("orderId").equals(orderId)){
- canOperation=0;
- }
- }
- }else {
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),4,null,null);
- if(order!=null && order.size()>0){
- if(!order.get(0).get("orderId").equals(orderId)){
- canOperation=0;
- }
- }
- }
- }
- map.put("canOperation",canOperation);
- return map;
- }
/**
* 走订单流程操作
@@ -381,37 +288,16 @@
@Override
public ResultUtil process(Integer orderId, Integer state, Double lon, Double lat, String address) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- Integer canOperation=1;
- if(state<5){
- if(orderPrivateCar.getPid()==null) {
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderId, 4, null, null);
- if (order != null && order.size()>0) {
- if(!order.get(0).get("orderId").equals(orderId)){
- canOperation=0;
- }
- }
- }else {
- List<Map<String, Object>> order = this.baseMapper.queryOrderInfo(orderPrivateCar.getPid(),4,null,null);
- if(order!=null && order.size()>0){
- if(!order.get(0).get("orderId").equals(orderId)){
- canOperation=0;
- }
- }
- }
- if(canOperation==0){
- return ResultUtil.error("当前订单不能操作");
- }
- }
switch (state){
case 3://出发前往预约点
orderPrivateCar.setState(3);
orderPrivateCar.setSetOutTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, "司机已出发，请耐心等待", orderPrivateCar.getUserId());
break;
case 4://到达预约点，等待客户上车
orderPrivateCar.setState(4);
orderPrivateCar.setArriveTime(new Date());
- systemNoticeService.addSystemNotice(1, "司机已到达您设置的预约地点，请及时上车", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, "司机已到达您设置的预约地点，请及时上车", orderPrivateCar.getUserId());
break;
case 5://开始服务
orderPrivateCar.setBoardingLon(lon);
@@ -422,7 +308,6 @@
orderPrivateCar.setStartServiceTime(new Date());
pushUtil.pushDriverPosition(orderPrivateCar.getId(), 1);//主动推送司机定位
-
break;
case 6://结束服务（专车可以返回继续服务）不修改状态
orderPrivateCar.setGetoffLon(lon);
@@ -443,23 +328,6 @@
pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, finalOrderPrivateCar.getState());
if(finalOrderPrivateCar.getState() == 5 && pushMinistryOfTransport){//上传数据
pushMinistryOfTransportUtil.operateDepart(orderId);
- }
- if(finalOrderPrivateCar.getState()==5 || finalOrderPrivateCar.getState()==6){
- if(finalOrderPrivateCar.getSpellSuccess()==1){
- if(finalOrderPrivateCar.getPid()==null){
- List<OrderPrivateCar> orderList1 = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid",finalOrderPrivateCar.getId()));
- for(OrderPrivateCar orderPrivateCar3:orderList1){
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- }else{
- List<OrderPrivateCar> orderList1 = orderPrivateCarMapper.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid",finalOrderPrivateCar.getPid()));
- for(OrderPrivateCar orderPrivateCar3:orderList1){
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- OrderPrivateCar orderPrivateCar3 = orderPrivateCarMapper.selectById(finalOrderPrivateCar.getPid());
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- }
}
}
}).start();
@@ -489,189 +357,7 @@
this.updateById(orderPrivateCar);
pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId(), 1);
-
- //回滚司机状态为空闲
- if(orderPrivateCar.getSpellSuccess()==0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }else{
- if(orderPrivateCar.getPid()==null){
- Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- if(number<=0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }
- }else{
- Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()).lt("state",6));
- if(number<=0 && number1<=0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }
- }
- }
-
- //修改总订单人数
- OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
- orderPrivateCar2.setTotalPeopleNum(orderPrivateCar.getTotalPeopleNum()-orderPrivateCar.getPeopleNum());
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
-//
- OrderPrivateCar finalOrderTaxi = orderPrivateCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
- pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
- }
- }).start();
- if(orderPrivateCar.getSpellSuccess()==1){
- List<OrderPrivateCar> orderList1 = this.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()));
- for(OrderPrivateCar orderPrivateCar3:orderList1){
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- OrderPrivateCar orderPrivateCar3 = this.selectById(orderPrivateCar.getPid());
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- OrderPrivateCar finalOrderPrivateCar = orderPrivateCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- if(pushMinistryOfTransport){//上传交通数据
- pushMinistryOfTransportUtil.baseInfoVehicleTotalMile(finalOrderPrivateCar.getCarId());
- pushMinistryOfTransportUtil.operateArrive(orderId);
- }
- }
- }).start();
-
-
- return ResultUtil.success();
- }
-
- @Override
- public ResultUtil cancleOrder(Integer orderId) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- orderPrivateCar.setState(10);
- orderPrivateCar.setDriverCancle(1);
- this.updateById(orderPrivateCar);
-
- pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId(), 1);
-
- //回滚司机状态为空闲
- if(orderPrivateCar.getSpellSuccess()==0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }else{
- if(orderPrivateCar.getPid()==null){
- Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- if(number<=0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }
- }else{
- Integer number = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()).lt("state",6));
- if(number<=0 && number1<=0){
- Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
- }
- }
- }
-
- Integer number1 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- Integer number2 = this.selectCount(new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- if(number1+number2==1){
- OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
- orderPrivateCar2.setTotalPeopleNum(orderPrivateCar.getTotalPeopleNum()-orderPrivateCar.getPeopleNum());
- orderPrivateCar2.setSpellSuccess(0);
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
-
- }else{
- OrderPrivateCar orderPrivateCar2 = new OrderPrivateCar();
- orderPrivateCar2.setTotalPeopleNum(orderPrivateCar.getTotalPeopleNum()-orderPrivateCar.getPeopleNum());
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- this.update(orderPrivateCar2,new EntityWrapper<OrderPrivateCar>().eq("id",orderPrivateCar.getPid()==null?orderPrivateCar.getId():orderPrivateCar.getPid()).lt("state",6));
- }
- OrderPrivateCar finalOrderTaxi = orderPrivateCar;
- new Thread(new Runnable() {
- @Override
- public void run() {
- pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
- //pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState());
- }
- }).start();
- if(orderPrivateCar.getSpellSuccess()==1){
- if(orderPrivateCar.getPid()==null){
- List<OrderPrivateCar> orderList1 = this.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getId()));
- for(OrderPrivateCar orderPrivateCar3:orderList1){
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- // pushUtil.pushOrderState(1, orderPrivateCar.getUserId(), orderPrivateCar.getId(), 1, 13);
- }else{
- List<OrderPrivateCar> orderList1 = this.selectList(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getPid()));
- for(OrderPrivateCar orderPrivateCar3:orderList1){
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- OrderPrivateCar orderPrivateCar3 = this.selectById(orderPrivateCar.getPid());
- pushUtil.pushOrderState(1, orderPrivateCar3.getUserId(), orderPrivateCar3.getId(), 1, 13);
- }
- }
- return ResultUtil.success();
- }
-
-
- @Override
- public ResultUtil updatePeopleNum(Integer orderId, Integer peopleNum) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- orderPrivateCar.setPeopleNum(peopleNum);
- if(peopleNum==4){
- orderPrivateCar.setRideType(1);
- }
- this.updateById(orderPrivateCar);
- return ResultUtil.success();
- }
-
- @Override
- public ResultUtil confirmFees1(Integer orderId, Integer type, String additionalFee) throws Exception {
- OrderPrivateCar orderPrivateCar = this.selectById(orderId);
- orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用
- orderPrivateCar.setPayManner(type);
- orderPrivateCar.setParkMoney(0D);
- orderPrivateCar.setRoadTollMoney(0D);
- Company company = companyService.selectById(orderPrivateCar.getCompanyId());
- orderPrivateCar.setHolidayFee(null == company.getHolidayFee() ? 0D : company.getHolidayFee());
-
- Double t = 0D;
- if(ToolUtil.isNotEmpty(additionalFee)){//附加费
- JSONArray jsonArray = JSON.parseArray(additionalFee);
- for(int i = 0; i < jsonArray.size(); i++){
- JSONObject jsonObject = jsonArray.getJSONObject(i);
- Integer id = jsonObject.getInteger("id");
- Double amount = jsonObject.getDouble("amount");
- OrderAdditionalFee orderAdditionalFee = new OrderAdditionalFee();
- orderAdditionalFee.setOrderType(1);
- orderAdditionalFee.setOrderId(orderId);
- orderAdditionalFee.setAdditionalFeeId(id);
- orderAdditionalFee.setAmount(amount);
- orderAdditionalFeeService.insert(orderAdditionalFee);
- t += amount;
- }
- }
- orderPrivateCar.setOrderMoney(orderPrivateCar.getOrderMoney() + orderPrivateCar.getParkMoney() + orderPrivateCar.getRoadTollMoney() + orderPrivateCar.getHolidayFee() + t);
- orderPrivateCar.setState(7);
- this.updateById(orderPrivateCar);
-
- pushUtil.removeTask(orderId, 1);//删除定时任务，结束推送数据
- systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId(), 1);
+ systemNoticeService.addSystemNotice(1, "司机已结束本次行程，谢谢使用", orderPrivateCar.getUserId());
//回滚司机状态为空闲
Driver driver = driverService.selectById(orderPrivateCar.getDriverId());
@@ -703,7 +389,6 @@
}
-
/**
* 获取订单费用明细
* @param orderId
@@ -714,7 +399,7 @@
public Map<String, Object> queryMoneyInfo(Integer orderId) throws Exception {
OrderPrivateCar orderPrivateCar = this.selectById(orderId);
if(orderPrivateCar.getState() == 5){//服务中的时候获取实时费用数据
- orderPrivateCar=this.setMoney(orderPrivateCar, 0D, 0D);
+ this.setMoney(orderPrivateCar, 0D, 0D);
}
Map<String, Object> map = new HashMap<>();
@@ -735,18 +420,6 @@
map.put("couponMoney", orderPrivateCar.getCouponMoney());//优惠券抵扣金额
map.put("discountMoney", orderPrivateCar.getDiscountMoney());//折扣抵扣金额
map.put("discount", orderPrivateCar.getDiscount());//折扣
- map.put("holidayFee", orderPrivateCar.getHolidayFee());//节假日费
-
- List<OrderAdditionalFee> orderAdditionalFees = orderAdditionalFeeService.selectList(new EntityWrapper<OrderAdditionalFee>().eq("orderType", 1).eq("orderId", orderId));
- List<Map<String, Object>> list = new ArrayList<>();
- orderAdditionalFees.forEach(orderAdditionalFee -> {
- AdditionalFee additionalFee = additionalFeeService.selectById(orderAdditionalFee.getAdditionalFeeId());
- Map<String, Object> map1 = new HashMap<>();
- map1.put("name", additionalFee.getName());
- map1.put("amount", orderAdditionalFee.getAmount());
- list.add(map1);
- });
- map.put("additionalFee", list);
return map;
}
@@ -801,12 +474,6 @@
return orderPrivateCarMapper.queryMaturity();
}
-
- @Override
- public List<OrderPrivateCar> taskMidAxbUnBindSend() throws Exception {
- return this.baseMapper.taskMidAxbUnBindSend();
- }
-
/**
* 计算价格
* @param orderPrivateCar
@@ -816,102 +483,48 @@
* @throws Exception
*/
public OrderPrivateCar setMoney(OrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception {
-
Map<String, Object> query1 = systemPriceMapper.query(orderPrivateCar.getCompanyId(), 1, orderPrivateCar.getServerCarModelId());
//开始根据不同的方式计算金额
double amount = 0;
JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());
+ Double num1 = jsonObject.getDouble("num1");//起步价（元）
+ Double num2 = jsonObject.getDouble("num2");//起步公里（公里）
+ Double num3 = jsonObject.getDouble("num3");//起步时间（分钟）
+ Double num4 = jsonObject.getDouble("num4");//里程费（元）
+ Double num5 = jsonObject.getDouble("num5");//时长费（分钟）
+ Double num6 = jsonObject.getDouble("num6");//等待费（分钟）
+ Double num7 = jsonObject.getDouble("num7");//等待费（元）
+ Double num8 = jsonObject.getDouble("num8");//远途费（公里）
+ Double num9 = jsonObject.getDouble("num9");//远途费（公里）
+ Double num10 = jsonObject.getDouble("num10");//远途费（元）
+ Double num11 = jsonObject.getDouble("num11");//远途费（公里）
+ Double num12 = jsonObject.getDouble("num12");//远途费（公里）
+ Double num13 = jsonObject.getDouble("num13");//远途费（元）
+ Double num14 = jsonObject.getDouble("num14");//远途费（公里）
+ Double num15 = jsonObject.getDouble("num15");//远途费（元）
+ String num16 = jsonObject.getString("num16");//夜间费（开始时间）
+ Double num17 = jsonObject.getDouble("num17");//夜间费（元）
+ Double num18 = jsonObject.getDouble("num18");//夜间费（元）
+ Double num19 = jsonObject.getDouble("num19");//夜间费（元）
+ Double num20 = jsonObject.getDouble("num20");//夜间费（元）
+ Double num21 = jsonObject.getDouble("num21");//夜间费（元）
+ Double num22 = jsonObject.getDouble("num22");//夜间费（元）
+ String num23 = jsonObject.getString("num23");//高峰费（开始时间）
+ String num24 = jsonObject.getString("num24");//高峰费（开始时间）
+ Double num25 = jsonObject.getDouble("num25");//高峰费（元）
+ Double num26 = jsonObject.getDouble("num26");//高峰费（元）
+ Double num27 = jsonObject.getDouble("num27");//高峰费（元）
+ Double num28 = jsonObject.getDouble("num28");//高峰费（元）
+ Double num29 = jsonObject.getDouble("num29");//高峰费（元）
+ Double num30 = jsonObject.getDouble("num30");//高峰费（元）
- JSONObject contentPutOne = JSON.parseObject(query1.get("contentPutOne").toString());//一人拼成
- JSONObject contentNotOne = JSON.parseObject(query1.get("contentNotOne").toString());//一人未拼成
- JSONObject contentPutTwo = JSON.parseObject(query1.get("contentPutTwo").toString());//2人拼成
- JSONObject contentNotTwo = JSON.parseObject(query1.get("contentNotTwo").toString());//2人未拼成
- JSONObject contentPutThree = JSON.parseObject(query1.get("contentPutThree").toString());//3人拼成
- JSONObject contentNotThree = JSON.parseObject(query1.get("contentNotThree").toString());//3人未拼成
- JSONObject contentExclusive = JSON.parseObject(query1.get("contentExclusive").toString());//独享
- JSONObject contentPrice = JSON.parseObject(query1.get("contentPrice").toString());//一口价
- //乘车类型(1=独享，2=一口价，3=拼车)
- orderPrivateCar.setWaitRule(jsonObject.toJSONString());
- if(orderPrivateCar.getRideType()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentExclusive,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else if(orderPrivateCar.getRideType()==2){
- double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage());
- double estimateMileage = (null == orderPrivateCar.getEstimateMileage() ? 0D : orderPrivateCar.getEstimateMileage());
- //在价格区间按照一口价算，不在区间按实时价格算
- if(d<estimateMileage+contentPrice.getDouble("num29")*1000 && d>estimateMileage-contentPrice.getDouble("num32")*1000){
- orderPrivateCar = calculationPrice1(orderPrivateCar,contentPrice,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentExclusive,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }
- }else{
- //判断是否是拼单
- if(orderPrivateCar.getSpellSuccess()==0){
- if(orderPrivateCar.getPeopleNum()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotOne,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentPutOne.toJSONString());
- }else if(orderPrivateCar.getPeopleNum()==2){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotTwo,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentPutTwo.toJSONString());
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotThree,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentPutThree.toJSONString());
- }
- }else{
- if(orderPrivateCar.getPeopleNum()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutOne,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentNotOne.toJSONString());
- }else if(orderPrivateCar.getPeopleNum()==2){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutTwo,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentNotTwo.toJSONString());
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutThree,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- orderPrivateCar.setChargeRules(contentNotThree.toJSONString());
- }
- }
- /*if(orderPrivateCar.getPid()==null){
- Integer number = orderPrivateCarMapper.selectCount(new EntityWrapper<OrderPrivateCar>().eq("pid",orderPrivateCar.getId()).ne("state",10).ne("state",12));
- if(number<=0){
- if(orderPrivateCar.getPeopleNum()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotOne,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else if(orderPrivateCar.getPeopleNum()==2){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotTwo,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentNotThree,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }
- }else{
- if(orderPrivateCar.getPeopleNum()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutOne,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else if(orderPrivateCar.getPeopleNum()==2){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutTwo,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutThree,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }
- }
- }else{
- if(orderPrivateCar.getPeopleNum()==1){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutOne,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else if(orderPrivateCar.getPeopleNum()==2){
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutTwo,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }else{
- orderPrivateCar = calculationPrice(orderPrivateCar,contentPutThree,jsonObject.getLongValue("num1"),jsonObject.getDouble("num2"),parkingFee,crossingFee);
- }
- }*/
- }
- return orderPrivateCar;
- }
-
- public OrderPrivateCar calculationPrice(OrderPrivateCar orderPrivateCar,JSONObject rule, long wait,Double waitMoney, Double parkingFee, Double crossingFee) throws Exception {
- orderPrivateCar.setChargeRule(rule.toJSONString());
- double amount = 0;
- //等待费
Date date = new Date();
- if(orderPrivateCar.getEndServiceTime()==null)orderPrivateCar.setEndServiceTime(date);
double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage()) / 1000;//实际公里
double t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间（不满一分钟按一分钟算）
- double d1 = (d - rule.getDouble("num2")) < 0 ? 0 : d - rule.getDouble("num2");//超出起步里程的公里
- double t1 = (t - rule.getDouble("num3")) < 0 ? 0 : t - rule.getDouble("num3");//超过起步分钟数的时间
double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
- double w1 = (w - wait) < 0 ? 0 : new BigDecimal(w - wait).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超出等待时间的时间
+ double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
+ double t1 = (t - num3) < 0 ? 0 : new BigDecimal(t - num3).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超过起步分钟数的时间
+ double w1 = (w - num6) < 0 ? 0 : new BigDecimal(w - num6).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超出等待时间的时间
double yt1 = 0;//远途1段
double yt2 = 0;//远途2段
double yt3 = 0;//远途3段
@@ -920,34 +533,40 @@
//夜间服务处理逻辑
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num14").split(" - ")[0].split(":")[0]));
- s.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num14").split(" - ")[0].split(":")[1]));
+ 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(rule.getString("num14").split(" - ")[1].split(":")[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num14").split(" - ")[1].split(":")[1]));
+ 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 > rule.getDouble("num6")){
- yt1 = rule.getDouble("num18") * (rule.getDouble("num7") - rule.getDouble("num6"));
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num20 * (d - num8);
}
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num19") * (rule.getDouble("num10") - rule.getDouble("num9"));
+ if(d > num9.doubleValue()){
+ yt1 = num20 * (num9 - num8);
}
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num20") * (d - rule.getDouble("num12"));
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num21 * (d - num11);
}
- amount = rule.getDouble("num15") + (d1 * rule.getDouble("num16")) + (t1 * rule.getDouble("num17")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num15"));//起步价
+ 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.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num16")).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 * rule.getDouble("num17")).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 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 0).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);//过路费
@@ -956,137 +575,57 @@
orderPrivateCar.setDiscount(0D);//优惠抵扣
orderPrivateCar.setPayMoney(0D);//支付金额
orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }else{
- Calendar s1 = Calendar.getInstance();
- s1.setTime(date);
- s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num21").split(" - ")[0].split(":")[0]));
- s1.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num21").split(" - ")[0].split(":")[1]));
-
- Calendar e1 = Calendar.getInstance();
- e1.setTime(date);
- e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num21").split(" - ")[1].split(":")[0]));
- e1.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num21").split(" - ")[1].split(":")[1]));
-
- Calendar s2 = Calendar.getInstance();
- s2.setTime(date);
- s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num22").split(" - ")[0].split(":")[0]));
- s2.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num22").split(" - ")[0].split(":")[1]));
-
- Calendar e2 = Calendar.getInstance();
- e2.setTime(date);
- e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num22").split(" - ")[1].split(":")[0]));
- e2.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num22").split(" - ")[1].split(":")[1]));
- //高峰时段处理逻辑
- if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
- if(d > rule.getDouble("num6")){
- yt1 = rule.getDouble("num26") * (rule.getDouble("num7") - rule.getDouble("num6"));
- }
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num27") * (rule.getDouble("num10") - rule.getDouble("num9"));
- }
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num28") * (d - rule.getDouble("num12"));
- }
- amount = rule.getDouble("num23") + (d1 * rule.getDouble("num24")) + (t1 * rule.getDouble("num25")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num23"));//起步价
- orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num24")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
- orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * rule.getDouble("num25")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
- orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 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());
- }else{
- //其他时间段的计算
- if(d > rule.getDouble("num6")){
- yt1 = rule.getDouble("num8") * (rule.getDouble("num7") - rule.getDouble("num6"));
- }
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num11") * (rule.getDouble("num10") - rule.getDouble("num9"));
- }
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num13") * (d - rule.getDouble("num12"));
- }
- amount = rule.getDouble("num1") + (d1 * rule.getDouble("num4")) + (t1 * rule.getDouble("num5")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num1"));//起步价
- orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num4")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
- orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * rule.getDouble("num5")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
- orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 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());
- }
+ return orderPrivateCar;
}
- return orderPrivateCar;
- }
+ //高峰时段处理逻辑
+ Calendar s1 = Calendar.getInstance();
+ s1.setTime(date);
+ s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[0].split(":")[0]));
+ s1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[0].split(":")[1]));
- public OrderPrivateCar calculationPrice1(OrderPrivateCar orderPrivateCar,JSONObject rule, long wait,Double waitMoney, Double parkingFee, Double crossingFee) throws Exception {
- double amount = 0;
- //等待费
- Date date = new Date();
- double d = (null == orderPrivateCar.getEstimateMileage() ? 0D : orderPrivateCar.getEstimateMileage()) / 1000;//实际公里
- double t = orderPrivateCar.getEstimateTime();//实际时间（不满一分钟按一分钟算）
- double d1 = (d - rule.getDouble("num1")) < 0 ? 0 : d - rule.getDouble("num1");//超出起步里程的公里
- double t1 = (t - rule.getDouble("num2")) < 0 ? 0 : t - rule.getDouble("num2");//超过起步分钟数的时间
- double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟（不满一分钟按一分钟算）
- double w1 = (w - wait) < 0 ? 0 : new BigDecimal(w - wait).setScale(0, BigDecimal.ROUND_UP).doubleValue();//超出等待时间的时间
- double yt1 = 0;//远途1段
- double yt2 = 0;//远途2段
- double yt3 = 0;//远途3段
+ Calendar e1 = Calendar.getInstance();
+ e1.setTime(date);
+ e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num23.split(" - ")[1].split(":")[0]));
+ e1.set(Calendar.MINUTE, Integer.valueOf(num23.split(" - ")[1].split(":")[1]));
+ Calendar s2 = Calendar.getInstance();
+ s2.setTime(date);
+ s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[0].split(":")[0]));
+ s2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[0].split(":")[1]));
- //夜间服务处理逻辑
- Calendar s = Calendar.getInstance();
- s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num14").split(" - ")[0].split(":")[0]));
- s.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num14").split(" - ")[0].split(":")[1]));
+ Calendar e2 = Calendar.getInstance();
+ e2.setTime(date);
+ e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(num24.split(" - ")[1].split(":")[0]));
+ e2.set(Calendar.MINUTE, Integer.valueOf(num24.split(" - ")[1].split(":")[1]));
- Calendar e = Calendar.getInstance();
- e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num14").split(" - ")[1].split(":")[0]));
- e.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num14").split(" - ")[1].split(":")[1]));
-
- if(date.getTime() > s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
- if(d > rule.getDouble("num6")){
- yt1 = rule.getDouble("num18") * (rule.getDouble("num7") - rule.getDouble("num6"));
+ if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num28 * (d - num8);
}
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num19") * (rule.getDouble("num10") - rule.getDouble("num9"));
+ if(d > num9.doubleValue()){
+ yt1 = num28 * (num9 - num8);
}
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num20") * (d - rule.getDouble("num12"));
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num29 * (d - num11);
}
- amount = rule.getDouble("num15") + (d1 * rule.getDouble("num16")) + (t1 * rule.getDouble("num17")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num15"));//起步价
+ if(d > num12.doubleValue()){
+ yt2 = num29 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num30 * (d - num14);
+ }
+ amount = num25 + (d1 * num26) + (t1 * num27) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartMoney(num25);//起步价
orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num16")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num26).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * rule.getDouble("num17")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num27).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 0).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);//过路费
@@ -1095,86 +634,43 @@
orderPrivateCar.setDiscount(0D);//优惠抵扣
orderPrivateCar.setPayMoney(0D);//支付金额
orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }else{
- Calendar s1 = Calendar.getInstance();
- s1.setTime(date);
- s1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num21").split(" - ")[0].split(":")[0]));
- s1.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num21").split(" - ")[0].split(":")[1]));
-
- Calendar e1 = Calendar.getInstance();
- e1.setTime(date);
- e1.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num21").split(" - ")[1].split(":")[0]));
- e1.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num21").split(" - ")[1].split(":")[1]));
-
- Calendar s2 = Calendar.getInstance();
- s2.setTime(date);
- s2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num22").split(" - ")[0].split(":")[0]));
- s2.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num22").split(" - ")[0].split(":")[1]));
-
- Calendar e2 = Calendar.getInstance();
- e2.setTime(date);
- e2.set(Calendar.HOUR_OF_DAY, Integer.valueOf(rule.getString("num22").split(" - ")[1].split(":")[0]));
- e2.set(Calendar.MINUTE, Integer.valueOf(rule.getString("num22").split(" - ")[1].split(":")[1]));
- //高峰时段处理逻辑
- if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis()) || (date.getTime() > s2.getTimeInMillis() && date.getTime() < e2.getTimeInMillis())){
- if(d > rule.getDouble("num6")){
- yt1 = rule.getDouble("num26") * (rule.getDouble("num7") - rule.getDouble("num6"));
- }
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num27") * (rule.getDouble("num10") - rule.getDouble("num9"));
- }
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num28") * (d - rule.getDouble("num12"));
- }
- amount = rule.getDouble("num23") + (d1 * rule.getDouble("num24")) + (t1 * rule.getDouble("num25")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num23"));//起步价
- orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num24")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
- orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * rule.getDouble("num25")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
- orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 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());
- }else{
- //其他时间段的计算
- if(d > rule.getDouble("num6")){
- yt1 = rule.getDouble("num8") * (rule.getDouble("num7") - rule.getDouble("num6"));
- }
- if(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num11") * (rule.getDouble("num10") - rule.getDouble("num9"));
- }
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num13") * (d - rule.getDouble("num12"));
- }
- amount = rule.getDouble("num1") + (d1 * rule.getDouble("num4")) + (t1 * rule.getDouble("num5")) + (w1 * waitMoney) + yt1 + yt2 + yt3;
- orderPrivateCar.setStartMileage(rule.getDouble("num2"));
- orderPrivateCar.setStartMoney(rule.getDouble("num1"));//起步价
- orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setMileageMoney(new BigDecimal(d1 * rule.getDouble("num4")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
- orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setDurationMoney(new BigDecimal(t1 * rule.getDouble("num5")).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//时长费
- orderPrivateCar.setWait(new BigDecimal(w1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- orderPrivateCar.setWaitMoney(new BigDecimal(w1 * waitMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//等待费
- orderPrivateCar.setLongDistance(new BigDecimal((d > rule.getDouble("num6")) ? d - rule.getDouble("num6") : 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());
- }
+ return orderPrivateCar;
}
+
+ //其他时间段的计算
+ if(d > num8.doubleValue() && d <= num9.doubleValue()){
+ yt1 = num10 * (d - num8);
+ }
+ if(d > num9.doubleValue()){
+ yt1 = num10 * (num9 - num8);
+ }
+ if(d > num11.doubleValue() && d <= num12.doubleValue()){
+ yt2 = num13 * (d - num11);
+ }
+ if(d > num12.doubleValue()){
+ yt2 = num13 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num15 * (d - num14);
+ }
+ amount = num1 + (d1 * num4) + (t1 * num5) + (w1 * num7) + yt1 + yt2 + yt3;
+ orderPrivateCar.setStartMileage(num2);
+ orderPrivateCar.setStartMoney(num1);//起步价
+ orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num4).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());//里程费
+ orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num5).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());
return orderPrivateCar;
}
}
--
Gitblit v1.7.1