From 1b81b84edaeea9b200c622e4a34c49b4b1aaac92 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 06 三月 2025 15:28:19 +0800
Subject: [PATCH] 修改bug和漏洞修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 5ffa92c..f269681 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -522,8 +522,12 @@
}
-
-
+ public static void main(String[] args) {
+ ;
+ System.err.println(Integer.parseInt("01"));
+ System.err.println(Integer.valueOf("01"));
+ ;
+ }
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
@@ -552,15 +556,19 @@
for (TChargingOrderAccountingStrategy tChargingOrderAccountingStrategy : list) {
String format = "";
String format1 = "";
- String temp1=list.get(0).getStartTime().split(":")[0];
- String[] split = tChargingOrderAccountingStrategy.getStartTime().split(":");
- if (Integer.parseInt(split[0])>=Integer.valueOf(temp1)){
+// String temp1=list.get(0).getStartTime().split(":")[0];
+ System.err.println("订单详情时间第一条"+list.get(0).getStartTime());
+ System.err.println("订单详情时间开始"+tChargingOrderAccountingStrategy.getStartTime());
+ System.err.println("订单详情时间结束"+tChargingOrderAccountingStrategy.getEndTime());
+ String temp1=list.get(0).getStartTime().split(" ")[1].split(":")[0];
+ String[] split = tChargingOrderAccountingStrategy.getStartTime().split(" ")[1].split(":");
+ if (Integer.parseInt(split[0])>=Integer.parseInt(temp1)){
format = byId.getCreateTime().format(formatter);
}else {
format = byId.getEndTime().format(formatter);
}
- String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(":");
- if (Integer.parseInt(split1[0])<Integer.valueOf(temp1)){
+ String[] split1 = tChargingOrderAccountingStrategy.getEndTime().split(" ")[1].split(":");
+ if (Integer.parseInt(split1[0])<Integer.parseInt(temp1)){
format1 = byId.getCreateTime().format(formatter);
}else {
format1 = byId.getEndTime().format(formatter);
@@ -1051,9 +1059,21 @@
map.put("shopAmount",data1);
BigDecimal data2 = vipOrderService.getSumAmout(sixBefore);
map.put("vipAmount",data2);
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().between(TChargingOrder::getCreateTime, sixBefore, LocalDate.now()).list();
+ BigDecimal serviceCharge = new BigDecimal("0");
+ BigDecimal commissionAmount = new BigDecimal("0");
+ for (TChargingOrder chargingOrder : list) {
+ if (chargingOrder.getOrderSource().equals(2)){
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ commissionAmount = commissionAmount.add(chargingOrder.getServiceCharge()!=null?chargingOrder.getServiceCharge().multiply(new BigDecimal("0.2")).setScale(2,BigDecimal.ROUND_DOWN):new BigDecimal("0"));
+ }else{
+ serviceCharge = serviceCharge.add(chargingOrder.getServiceCharge());
+ }
-
+ }
+ map.put("service_charge",serviceCharge);
+ map.put("commission_amount",commissionAmount);
return R.ok(map);
}
@@ -1120,7 +1140,11 @@
if (chargingOrderVO != null) {
BeanUtils.copyProperties(chargingOrderVO, dataDto);
}
+
BeanUtils.copyProperties(uploadRealTimeMonitoringData, dataDto);
+ if (chargingOrderVO != null && chargingOrderVO.getOrderSource()==2){
+ dataDto.setPeriod_service_price(uploadRealTimeMonitoringData.getPeriod_service_price().multiply(new BigDecimal("0.2").setScale(2,BigDecimal.ROUND_DOWN)));
+ }
dataDto.setStartTime(uploadRealTimeMonitoringData.getStartTime());
dataDto.setEndTime(uploadRealTimeMonitoringData.getEndTime() == null ? null : uploadRealTimeMonitoringData.getEndTime());
dataDto.setStatus(uploadRealTimeMonitoringData.getStatus());
@@ -2242,4 +2266,6 @@
return chargingOrderService.getNotPaymentChargingOrder();
}
+
+
}
--
Gitblit v1.7.1