From de9d3974b9068ffc0893f62d33b50e3864603c80 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 06 九月 2024 17:38:56 +0800 Subject: [PATCH] 2.0bug修改 --- ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java | 384 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 373 insertions(+), 11 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 8388146..40a2a35 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; @@ -10,9 +14,14 @@ import com.stylefeng.guns.core.util.ExcelExportUtil; import com.stylefeng.guns.core.util.SinataUtil; import com.stylefeng.guns.core.util.ToolUtil; +import com.stylefeng.guns.modular.system.controller.util.PushUtil; +import com.stylefeng.guns.modular.system.controller.util.TextToSpeechUtil; 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.ChinaMobileUtil; +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; @@ -25,11 +34,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStreamReader; +import java.io.*; import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; import java.util.*; /** @@ -61,6 +69,12 @@ @Value("${filePath}") private String filePath; + + @Autowired + private FleetEngineUtil fleetEngineUtil; + + @Resource + private ITUserService userService; @@ -192,6 +206,9 @@ TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(id); orderPrivateCar.setAbnormalMoney(orderPrivateCar.getOrderMoney()); orderPrivateCar.setOrderMoney(money); + orderPrivateCar.setPayMoney(money); + orderPrivateCar.setState(7); + orderPrivateCar.setIsDispute(1); orderPrivateCar.updateById(); return SUCCESS_TIP; } @@ -199,12 +216,17 @@ @RequestMapping(value = "/frozenOrder") @ResponseBody - public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) { + public Object frozenOrder(@RequestParam Integer tOrderPrivateCarId) throws Exception { TOrderPrivateCar orderPrivateCar = tOrderPrivateCarService.selectById(tOrderPrivateCarId); + + //添加已收入明细 + TDriver tDriver = driverService.selectById(orderPrivateCar.getDriverId()); + orderPrivateCar = this.setMoney(orderPrivateCar, 0D, 0D);//计算费用 //添加已收入明细 TCompany company = companyService.selectById(orderPrivateCar.getCompanyId()); Double taxi = company.getSpeMoney().doubleValue(); + Integer language =tDriver.getLanguage(); BigDecimal d = null;//企业收入 BigDecimal c = null;//司机收入 if(company.getIsSpeFixedOrProportional() == 2){//固定 @@ -224,7 +246,6 @@ driver.setFrozenMoney(driver.getFrozenMoney().add(c)); driverService.updateById(driver); }else{ - TDriver driver = driverService.selectById(orderPrivateCar.getDriverId()); driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); @@ -232,10 +253,338 @@ driver.setFrozenMoney(driver.getFrozenMoney().subtract(c)); driverService.updateById(driver); } + if (orderPrivateCar.getIsFrozen() == 1){ + TOrderPrivateCar orderPrivateCar1 = tOrderPrivateCarService.selectById(tOrderPrivateCarId); + if(orderPrivateCar1.getArriveTime()==null){ + orderPrivateCar1.setArriveTime(orderPrivateCar1.getStartServiceTime()); + } + orderPrivateCar1 = this.setMoney(orderPrivateCar1, 0D, 0D);//计算费用 + orderPrivateCar1.setOrderMoney(orderPrivateCar1.getOrderMoney().add(orderPrivateCar1.getParkMoney()).add(orderPrivateCar1.getRoadTollMoney())); + //判断是否首单免费-免费直接完成 + Integer orderNumber = tOrderPrivateCarService.selectCount(new EntityWrapper<TOrderPrivateCar>().eq("userId",orderPrivateCar1.getUserId()).last("and (state=8 or state=9)")); + + if(orderNumber<=0){//判断是否是首单 + //判断是否免单 + TUser userInfo = userService.selectById(orderPrivateCar1.getUserId()); + if(userInfo.getFreeMoney().doubleValue()>0d){ + if(orderPrivateCar1.getOrderMoney().compareTo(userInfo.getFreeMoney())<=-1){ + orderPrivateCar1.setState(8); + orderPrivateCar1.setIsFree(2); + //添加已收入明细 + TCompany tCompany = companyService.selectById(orderPrivateCar1.getCompanyId()); + BigDecimal speMoney = tCompany.getSpeMoney(); + + if(tCompany.getIsSpeFixedOrProportional() == 2){//固定 + d = speMoney; + c = orderPrivateCar1.getOrderMoney().subtract(d);//只有出行金额参与抽成,其余归属司机 + } + if(tCompany.getIsSpeFixedOrProportional() == 1){//比例 + BigDecimal price = orderPrivateCar1.getStartMoney().add(orderPrivateCar1.getMileageMoney()).add(new BigDecimal(orderPrivateCar1.getWaitMoney())).add(orderPrivateCar1.getDurationMoney()).add(orderPrivateCar1.getLongDistanceMoney()); + d = price.multiply(speMoney).divide(new BigDecimal(100), new MathContext(2, RoundingMode.HALF_EVEN)); + c = orderPrivateCar1.getOrderMoney().subtract(d).setScale(2, BigDecimal.ROUND_HALF_EVEN); + } + incomeService.saveData(1, orderPrivateCar1.getCompanyId(), 2, orderPrivateCar1.getId(), 1, d.doubleValue()); + incomeService.saveData(2, orderPrivateCar1.getDriverId(), 2, orderPrivateCar1.getId(), 1, c.doubleValue()); + TDriver driver = driverService.selectById(orderPrivateCar1.getDriverId()); + driver.setBusinessMoney(new BigDecimal(null != driver.getBusinessMoney() ? driver.getBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + driver.setLaveBusinessMoney(new BigDecimal(null != driver.getLaveBusinessMoney() ? driver.getLaveBusinessMoney() : 0).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue()); + if (null != driver.getBalance()){ + driver.setBalance(driver.getBalance().add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN)); + }else{ + driver.setBalance(BigDecimal.ZERO.add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN)); + } + driverService.updateById(driver); + }else{ + orderPrivateCar1.setState(7); + orderPrivateCar1.setOrderMoney(orderPrivateCar1.getOrderMoney().subtract(userInfo.getFreeMoney())); + orderPrivateCar1.setFreeMoney(userInfo.getFreeMoney()); + + } + + }else{ + orderPrivateCar1.setState(7); + } + + }else{ + orderPrivateCar1.setState(7); + } + + Map<String, String> map = chinaMobileUtil.midAxbUnBindSend(orderPrivateCar1.getBindId(),orderPrivateCar1.getTelX()); + if(String.valueOf(map.get("code")).equals("200")){ + orderPrivateCar1.setTelX(""); + orderPrivateCar1.setBindId(""); + } + tOrderPrivateCarService.updateById(orderPrivateCar1); + + + pushUtil.removeTask(orderPrivateCar1.getId(), 1);//删除定时任务,结束推送数据 + systemNoticeService.addSystemNotice(1, language == 1 ? "司机已结束本次行程,谢谢使用" : language == 2 ? + "The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderPrivateCar1.getUserId()); + + //回滚司机状态为空闲 + TDriver driver = driverService.selectById(orderPrivateCar1.getDriverId()); + driver.setState(2); + driverService.updateById(driver); + + TOrderPrivateCar finalOrderTaxi = orderPrivateCar1; + new Thread(new Runnable() { + @Override + public void run() { + pushUtil.pushOrderState(1, finalOrderTaxi.getUserId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState(), 0, ""); + pushUtil.pushOrderState(2, finalOrderTaxi.getDriverId(), finalOrderTaxi.getId(), 1, finalOrderTaxi.getState(), 0, ""); + } + }).start(); + + TOrderPrivateCar finalOrderPrivateCar = orderPrivateCar1; + new Thread(()->{ + try { + //上报google + fleetEngineUtil.reportBillableEvent(finalOrderPrivateCar.getTripId()); + System.err.println("上报时间:{},tripid:{},created_at:{},completed_at:{}"+ System.currentTimeMillis()+ finalOrderPrivateCar.getTripId()+ + finalOrderPrivateCar.getInsertTime().getTime()+finalOrderPrivateCar.getEndServiceTime().getTime()); + }catch (Exception e){ + e.printStackTrace(); + } + }).start(); + // 冻结订单需要给司机推送一个消息; + new Thread(new Runnable() { + @Override + public void run() { + pushUtil.frozenOrder(finalOrderPrivateCar.getDriverId(),2); + pushUtil.pushOrderState(2, finalOrderPrivateCar.getDriverId(), finalOrderPrivateCar.getId(), 1, 7, 0, ""); + } + }).start(); + } orderPrivateCar.setIsFrozen(orderPrivateCar.getIsFrozen()==1?2:1); tOrderPrivateCarService.updateAllColumnById(orderPrivateCar); + return SUCCESS_TIP; + } + @Autowired + private ChinaMobileUtil chinaMobileUtil; + @Autowired + private PushUtil pushUtil; + @Autowired + private ITSystemNoticeService systemNoticeService; + @Resource + private TSystemPriceMapper systemPriceMapper; + public TOrderPrivateCar setMoney(TOrderPrivateCar orderPrivateCar, Double parkingFee, Double crossingFee) throws Exception { + System.err.println("计算金额:"+orderPrivateCar); + 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;//实际公里 + if (orderPrivateCar.getEndServiceTime() == null){ + orderPrivateCar.setEndServiceTime(new Date()); + } + double t=1; + if (orderPrivateCar.getStartServiceTime() == null){ + t = 1;//实际时间(不满一分钟按一分钟算) + }else{ + 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; } /** * 支付专车订单 @@ -248,7 +597,7 @@ if(orderPrivateCar.getIsplatPay()==2){ return "error"; } - //添加已收入明细 + //添加已收入明细 TCompany company = companyService.selectById(orderPrivateCar.getCompanyId()); Double taxi = company.getSpeMoney().doubleValue(); BigDecimal d = null;//企业收入 @@ -270,6 +619,9 @@ driver.setBalance((null != driver.getBalance() ? driver.getBalance() : BigDecimal.ZERO).add(c).setScale(2, BigDecimal.ROUND_HALF_EVEN)); driverService.updateById(driver); orderPrivateCar.setIsplatPay(2); + orderPrivateCar.setPayManner(1); + orderPrivateCar.setState(8); + orderPrivateCar.setPayMoney(orderPrivateCar.getOrderMoney()); tOrderPrivateCarService.updateAllColumnById(orderPrivateCar); return SUCCESS_TIP; } @@ -291,17 +643,27 @@ tOrderPrivateCar.setState(10); tOrderPrivateCarService.updateById(tOrderPrivateCar); - + + TUser tUser = userService.selectById(tOrderPrivateCar.getUserId()); + Integer language = tUser.getLanguage(); OrderCancel orderCancel = new OrderCancel(); orderCancel.setOrderId(tOrderPrivateCarId); orderCancel.setOrderType(1); - orderCancel.setReason("平台取消订单"); - orderCancel.setRemark("平台取消订单"); + orderCancel.setReason(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande"); + orderCancel.setRemark(language == 1 ? "平台取消订单" : language == 2 ? "The platform cancelled the order" : "La plateforme a annulé la commande"); 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