From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
index a5177cc..24be159 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/api/HtmlController.java
@@ -22,6 +22,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
import java.util.Date;
/**
@@ -75,20 +76,41 @@
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 5));
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
- SimpleDateFormat sdf = new SimpleDateFormat("HHmm");
- Integer integer = Integer.valueOf(sdf.format(new Date()));
+ Date date = new Date();
for (int i = 0; i < chargeStandard.size(); i++) {
JSONObject jsonObject1 = chargeStandard.getJSONObject(i);
String num1 = jsonObject1.getString("num1");
String num2 = jsonObject1.getString("num2");
- num1 = num1.replaceAll(":", "");
- num2 = num2.replaceAll(":", "");
-
Double num3 = jsonObject1.getDouble("num3");
Double num4 = jsonObject1.getDouble("num4");
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
- if(integer >= Integer.valueOf(num1) && integer < Integer.valueOf(num2)){
+
+ String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
+ String[] split1 = num2.split(":");
+ Integer hour2 = Integer.valueOf(split1[0]);
+
+ Calendar s = Calendar.getInstance();
+ s.setTime(date);
+ s.set(Calendar.HOUR_OF_DAY, hour1);
+ s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
+ s.set(Calendar.SECOND, 0);
+
+ Calendar e = Calendar.getInstance();
+ e.setTime(date);
+ e.set(Calendar.HOUR_OF_DAY, hour2);
+ e.set(Calendar.MINUTE, Integer.valueOf(split1[1]));
+ e.set(Calendar.SECOND, 0);
+
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
+ if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
startPriceWarpper.setStartPrice(num4);
startPriceWarpper.setStartDistance(num3);
startPriceWarpper.setExcessMileageUnitPrice(num6);
--
Gitblit v1.7.1