Your Name лет назад: 3
Родитель
Сommit
ba69a4d6fc

+ 4 - 5
service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java

@@ -132,15 +132,14 @@ public class ChargeCoreImpl implements IChargeCore {
             throw new IllegalArgumentException("修改订单失败");
             throw new IllegalArgumentException("修改订单失败");
         }
         }
         String chargeHours = chargeMachineOrderDtos.get(0).getChargeHours();
         String chargeHours = chargeMachineOrderDtos.get(0).getChargeHours();
-        if ("999".equals(chargeHours)) {
-            chargeHours = "10";
-        }
-
         double cHours = Double.parseDouble(chargeHours);
         double cHours = Double.parseDouble(chargeHours);
+        if (999 == cHours) {
+            cHours = 10;
+        }
 
 
         Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
         Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
 
 
-        double usedHours = Math.ceil((DateUtil.getCurrentDate().getTime() - startTime.getTime()) / (60 * 60 * 1000));
+        double usedHours = Math.ceil((DateUtil.getCurrentDate().getTime() - startTime.getTime()) / (60 * 60 * 1000.00));
 
 
         BigDecimal freeHours = new BigDecimal(cHours).subtract(new BigDecimal(usedHours));
         BigDecimal freeHours = new BigDecimal(cHours).subtract(new BigDecimal(usedHours));
 
 

+ 2 - 3
springboot/src/test/java/com/java110/AppTest.java

@@ -24,8 +24,7 @@ public class AppTest
     public void should()
     public void should()
     {
     {
 
 
-       String carNum = "青agk916 ";
-
-        System.out.printf(carNum.trim().toUpperCase());
+        double usedHours = Math.ceil((DateUtil.getCurrentDate().getTime() - DateUtil.getDateFromStringA("2023-03-13 23:32:18").getTime()) / (60 * 60 * 1000.00));
+        System.out.printf(usedHours+"");
     }
     }
 }
 }