From 75a2623173bcc4a235aa1f99f7ef28519186160b Mon Sep 17 00:00:00 2001
From: yanghb <yanghb>
Date: 星期五, 21 四月 2023 11:24:25 +0800
Subject: [PATCH] 代码调整
---
UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java | 283 +++++++++++++++++++++++++-------------------------------
1 files changed, 127 insertions(+), 156 deletions(-)
diff --git a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
index aa31024..1478f2f 100644
--- a/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
+++ b/UserTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/ServerCarModelServiceImpl.java
@@ -2,17 +2,12 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.stylefeng.guns.modular.system.dao.ServerCarModelMapper;
import com.stylefeng.guns.modular.system.dao.SystemPriceMapper;
import com.stylefeng.guns.modular.system.model.Company;
-import com.stylefeng.guns.modular.system.model.OpenCity;
-import com.stylefeng.guns.modular.system.model.OpenCityBusiness;
import com.stylefeng.guns.modular.system.model.ServerCarModel;
import com.stylefeng.guns.modular.system.service.ICompanyCityService;
-import com.stylefeng.guns.modular.system.service.IOpenCityBusinessService;
-import com.stylefeng.guns.modular.system.service.IOpenCityService;
import com.stylefeng.guns.modular.system.service.IServerCarModelService;
import com.stylefeng.guns.modular.system.util.GDMapElectricFenceUtil;
import com.stylefeng.guns.modular.system.util.GDMapGeocodingUtil;
@@ -44,12 +39,6 @@
@Autowired
private ICompanyCityService companyCityService;
- @Autowired
- private IOpenCityService openCityService;
-
- @Autowired
- private IOpenCityBusinessService openCityBusinessService;
-
@@ -71,17 +60,6 @@
if(null == query){
return ResultUtil.error("起点暂无企业提供服务", new ArrayList<>());
}
- if(type == 1 && query.getIsSpe() == 2){
- return ResultUtil.success(new ArrayList<>());
- }
- OpenCity openCity = openCityService.openCity1(geocode.get("districtCode"));
- if(null != openCity){
- OpenCityBusiness openCityBusiness = openCityBusinessService.selectOne(new EntityWrapper<OpenCityBusiness>().eq("businessType", 1).eq("openCityId", openCity.getId()).ne("flag", 3));
- if(null == openCityBusiness){
- return ResultUtil.success(new ArrayList<>());
- }
- }
-
Map<String, String> distance = gdMapElectricFenceUtil.getDistance(startLonLat, endLonLat, 1);
if(null == distance){
return ResultUtil.error("获取预估距离出错", new ArrayList<>());
@@ -92,9 +70,9 @@
long duration_ = Long.valueOf(duration).longValue();
List<ServerCarModelWarpper> price = this.getPrice(query.getId(), distance1_, duration_, 0, 1);
-// if(price.size() == 0){
-// return ResultUtil.error("未获取到可服务的车型", new ArrayList<>());
-// }
+ if(price.size() == 0){
+ return ResultUtil.error("未获取到可服务的车型", new ArrayList<>());
+ }
return ResultUtil.success(price);
}
@@ -131,147 +109,140 @@
//开始根据不同的方式计算金额
double amount = 0;
if(type == 1){//专车
+ 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 = distance / 1000;//实际公里
double t = duration / 60;//实际时间
- JSONObject jsonObject = JSON.parseObject(query1.get("content").toString());//等待费
- Double waitMoney = jsonObject.getDouble("num2");
- 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());//一口价
- //一口价
+
+ double d1 = (d - num2) < 0 ? 0 : d - num2;//超出起步里程的公里
+ double t1 = (t - num3) < 0 ? 0 : t - num3;//超过起步分钟数的时间
+ double yt1 = 0;//远途1段
+ double yt2 = 0;//远途2段
+ double yt3 = 0;//远途3段
+
+
+ //夜间服务处理逻辑
+ 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()){
+ yt1 = num20 * (num9 - num8);
+ }
+ if(d > num11.doubleValue()){
+ yt2 = num21 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num22 * (d - num14);
+ }
+ amount = num17 + (d1 * num18) + (t1 * num19) + (wait * num7) + yt1 + yt2 + yt3;
+ ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
+ serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
+ serverCarModelWarpper.setMileage(d);
+ serverCarModelWarpper.setDuration(t);
+ data.add(serverCarModelWarpper);
+ continue;
+ }
+
+
+ //高峰时段处理逻辑
+ 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()){
+ yt1 = num28 * (num9 - num8);
+ }
+ if(d > num11.doubleValue()){
+ yt2 = num29 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num30 * (d - num14);
+ }
+ amount = num25 + (d1 * num26) + (t1 * num27) + (wait * num7) + yt1 + yt2 + yt3;
+ ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
+ serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
+ serverCarModelWarpper.setMileage(d);
+ serverCarModelWarpper.setDuration(t);
+ data.add(serverCarModelWarpper);
+ continue;
+ }
+
+ //其他时间段的计算
+ if(d > num8.doubleValue()){
+ yt1 = num10 * (num9 - num8);
+ }
+ if(d > num11.doubleValue()){
+ yt2 = num13 * (num12 - num11);
+ }
+ if(d > num14.doubleValue()){
+ yt3 = num15 * (d - num14);
+ }
+ amount = num1 + (d1 * num4) + (t1 * num5) + (wait * num7) + yt1 + yt2 + yt3;
ServerCarModelWarpper serverCarModelWarpper = ServerCarModelWarpper.getServerCarModelWarpper(map);
- serverCarModelWarpper.setFareTypeNote1(query1.get("fareTypeNote1").toString());
- serverCarModelWarpper.setFareTypeNote2(query1.get("fareTypeNote2").toString());
- serverCarModelWarpper.setFareTypeNote3(query1.get("fareTypeNote3").toString());
- serverCarModelWarpper.setContentPutOne(contentPutOne);
- serverCarModelWarpper.setContentNotOne(contentNotOne);
-
- serverCarModelWarpper.setContentPutTwo(contentPutTwo);
- serverCarModelWarpper.setContentNotTwo(contentNotTwo);
-
- serverCarModelWarpper.setContentPutThree(contentPutThree);
- serverCarModelWarpper.setContentNotThree(contentNotThree);
-
-
- serverCarModelWarpper.setContentExclusive(contentExclusive);
- serverCarModelWarpper.setContentPrice(contentPrice);
-
-
-
-
- serverCarModelWarpper.setAmount(new BigDecimal(this.calculationPrice(contentExclusive,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setBuyNowAmount(new BigDecimal(this.calculationPrice(contentPrice,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setPutTogetherOneAmount(new BigDecimal(this.calculationPrice(contentPutOne,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setNotAssembledOneAmount(new BigDecimal(this.calculationPrice(contentNotOne,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setPutTogetherTwoAmount(new BigDecimal(this.calculationPrice(contentPutTwo,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setNotAssembledTwoAmount(new BigDecimal(this.calculationPrice(contentNotTwo,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setPutTogetherThreeAmount(new BigDecimal(this.calculationPrice(contentPutThree,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
- serverCarModelWarpper.setNotAssembledThreeAmount(new BigDecimal(this.calculationPrice(contentNotThree,distance,duration,wait,waitMoney)).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
+ serverCarModelWarpper.setAmount(new BigDecimal(amount).setScale(BigDecimal.ROUND_HALF_EVEN, 2).doubleValue());
serverCarModelWarpper.setMileage(d);
serverCarModelWarpper.setDuration(t);
- serverCarModelWarpper.setIsOpen(Integer.parseInt(query1.get("isOpen").toString()));
- serverCarModelWarpper.setIsOpenExclusive(Integer.parseInt(query1.get("isOpenExclusive").toString()));
- serverCarModelWarpper.setIsOpenPrice(Integer.parseInt(query1.get("isOpenPrice").toString()));
data.add(serverCarModelWarpper);
-
-
-
-
-
-
-
-
+ continue;
}
}
return data;
}
- public Double calculationPrice(JSONObject rule, double distance, long duration, long wait,Double waitMoney) throws Exception {
- double amount = 0;
- //等待费
- Date date = new Date();
- double d = distance / 1000;//实际公里
- double t = duration / 60;//实际时间
- 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 yt1 = 0;//远途1段
- double yt2 = 0;//远途2段
- double yt3 = 0;//远途3段
-
- //夜间服务处理逻辑
- 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 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(d > rule.getDouble("num9")){
- yt2 = rule.getDouble("num19") * (rule.getDouble("num10") - rule.getDouble("num9"));
- }
- if(d > rule.getDouble("num12")){
- yt3 = rule.getDouble("num20") * (d - rule.getDouble("num12"));
- }
- amount = rule.getDouble("num15") + (d1 * rule.getDouble("num16")) + (t1 * rule.getDouble("num17")) + (wait * waitMoney) + yt1 + yt2 + yt3;
- }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")) + (wait * waitMoney) + yt1 + yt2 + yt3;
- }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")) + (wait * waitMoney) + yt1 + yt2 + yt3;
- }
- }
- return amount;
- }
}
--
Gitblit v1.7.1