From a606bc5b0af6bc85b8ce2bca66a1d74fac3751b7 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 22 七月 2024 17:19:09 +0800 Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 244 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 236 insertions(+), 8 deletions(-) diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java index 65e4908..e96561a 100644 --- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java +++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java @@ -1,8 +1,12 @@ package com.stylefeng.guns.modular.system.controller.specialTrain; +import cn.hutool.system.UserInfo; +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.plugins.Page; +import com.google.gson.Gson; import com.stylefeng.guns.core.base.controller.BaseController; import com.stylefeng.guns.core.common.constant.factory.PageFactory; import com.stylefeng.guns.core.shiro.ShiroKit; @@ -11,8 +15,10 @@ import com.stylefeng.guns.core.util.SinataUtil; import com.stylefeng.guns.core.util.ToolUtil; import com.stylefeng.guns.modular.system.dao.OrderCancelMapper; +import com.stylefeng.guns.modular.system.dao.TSystemPriceMapper; import com.stylefeng.guns.modular.system.model.*; import com.stylefeng.guns.modular.system.service.*; +import com.stylefeng.guns.modular.system.util.GoogleMap.FleetEngineUtil; import com.stylefeng.guns.modular.system.util.HttpRequestUtil; import com.stylefeng.guns.modular.system.util.PushURL; import com.stylefeng.guns.modular.system.util.ResultUtil; @@ -30,6 +36,8 @@ import java.io.FileInputStream; import java.io.InputStreamReader; import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; import java.util.*; /** @@ -59,11 +67,11 @@ @Resource private OrderCancelMapper orderCancelMapper; - @Value("${pushMinistryOfTransport}") - private boolean pushMinistryOfTransport; - @Value("${filePath}") private String filePath; + + @Autowired + private FleetEngineUtil fleetEngineUtil; @@ -202,9 +210,9 @@ @RequestMapping(value = "/frozenOrder") @ResponseBody - public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) { + public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception { TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId); - + orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用 //添加已收入明细 TCompany company = companyService.selectById(orderPrivateCar.getCompanyId()); Double taxi = company.getSpeMoney().doubleValue(); @@ -237,8 +245,220 @@ } orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1); + orderPrivateCar.setState(7); tOrderPrivateCarService.updateAllColumnById(orderPrivateCar); + return SUCCESS_TIP; + } + @Resource + private TSystemPriceMapper systemPriceMapper; + public TOrderPrivateCar setMoney(TOrderPrivateCar 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");//高峰费(元) + + Date date = new Date(); + double d = (null == orderPrivateCar.getMileage() ? 0D : orderPrivateCar.getMileage()) / 1000;//实际公里 + double t = ((orderPrivateCar.getEndServiceTime().getTime() - orderPrivateCar.getStartServiceTime().getTime()) / 60000) + 1;//实际时间(不满一分钟按一分钟算) + double w = ((orderPrivateCar.getStartServiceTime().getTime() - orderPrivateCar.getArriveTime().getTime()) / 60000) + 1;//等待分钟(不满一分钟按一分钟算) + 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段 + + + //夜间服务处理逻辑 + 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])); + + 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(new BigDecimal(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));//里程费 + orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num19).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费 + 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));//远途费 + orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费 + orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费 + orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣 + orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣 + orderPrivateCar.setDiscount(0D);//优惠抵扣 + orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额 + orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN)); + orderPrivateCar.setMoneyType(2); + orderPrivateCar.setMoneyTime(num16); + 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])); + + 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 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])); + + 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 > num9.doubleValue()){ + yt1 = num28 * (num9 - num8); + } + if(d > num11.doubleValue() && d <= num12.doubleValue()){ + yt2 = num29 * (d - num11); + } + 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.setStartDuration((int)(num3.doubleValue())); + orderPrivateCar.setStartMoney(new BigDecimal(num25));//起步价 + orderPrivateCar.setMileageKilometers(new BigDecimal(d1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + orderPrivateCar.setMileageMoney(new BigDecimal(d1 * num26).setScale(2, BigDecimal.ROUND_HALF_EVEN));//里程费 + orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num27).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费 + 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));//远途费 + orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费 + orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费 + orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣 + orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣 + orderPrivateCar.setDiscount(0D);//优惠抵扣 + orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额 + orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN)); + + orderPrivateCar.setMoneyType(3); + if((date.getTime() > s1.getTimeInMillis() && date.getTime() < e1.getTimeInMillis())){ + orderPrivateCar.setMoneyTime(num23); + }else{ + orderPrivateCar.setMoneyTime(num24); + } + + 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.setStartDuration((int)(num3.doubleValue())); + orderPrivateCar.setStartMoney(new BigDecimal(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));//里程费 + orderPrivateCar.setDuration(new BigDecimal(t1).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + orderPrivateCar.setDurationMoney(new BigDecimal(t1 * num5).setScale(2, BigDecimal.ROUND_HALF_EVEN));//时长费 + 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));//远途费 + orderPrivateCar.setParkMoney(new BigDecimal(parkingFee));//停车费 + orderPrivateCar.setRoadTollMoney(new BigDecimal(crossingFee));//过路费 + orderPrivateCar.setRedPacketMoney(new BigDecimal("0"));//红包抵扣 + orderPrivateCar.setCouponMoney(new BigDecimal("0"));//优惠券抵扣 + orderPrivateCar.setDiscount(0D);//优惠抵扣 + orderPrivateCar.setPayMoney(new BigDecimal("0"));//支付金额 + orderPrivateCar.setOrderMoney(new BigDecimal(amount + parkingFee + crossingFee).setScale(2, BigDecimal.ROUND_HALF_EVEN)); +// + orderPrivateCar.setMoneyType(1); + return orderPrivateCar; } /** * 支付专车订单 @@ -298,13 +518,21 @@ OrderCancel orderCancel = new OrderCancel(); orderCancel.setOrderId(tOrderPrivateCarId); orderCancel.setOrderType(1); - orderCancel.setReason("平台取消订单"); - orderCancel.setRemark("平台取消订单"); + orderCancel.setReason("The platform cancels the order"); + orderCancel.setRemark("The platform cancels the order"); orderCancel.setUserType(2); orderCancel.setState(2); orderCancel.setInsertTime(new Date()); orderCancelMapper.insert(orderCancel); - + + //修改行程信息 + try { + fleetEngineUtil.updateTrip("CANCELED", null, null, tOrderPrivateCar.getTripId(), null, null, null, null); + } catch (Exception e) { + throw new RuntimeException(e); + } + + //增加推送 Map<String,String> map = new HashMap<>(); map.put("id", tOrderPrivateCar.getId().toString()); -- Gitblit v1.7.1