From 7858ae894c398f2f9248ac898b2ff200fa36225d Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期三, 29 七月 2026 18:42:15 +0800
Subject: [PATCH] 各类修复
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java | 58 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
index ad70d09..fc09307 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TVipOrderController.java
@@ -267,41 +267,59 @@
List<ChargingOrderVO> list = chargingOrderService.chargingOrderList(orderQuery).getRecords();
List<EnterpriseChargingDetailExport> exports = new ArrayList<>();
for (ChargingOrderVO order : list) {
- EnterpriseChargingDetailExport export = new EnterpriseChargingDetailExport();
- export.setCode(order.getCode());
- export.setOrderType(Integer.valueOf(1).equals(order.getOrderType()) ? "小程序" : "刷卡");
- export.setOrderClassification("充电订单");
- export.setSiteName(order.getSiteName());
- export.setTerminalName(order.getTerminalName());
- export.setStatus(getChargingOrderStatus(order.getStatus()));
- export.setChargingSecond(order.getChargingSecond());
- export.setTotalAmount(order.getOrderAmount());
- export.setCouponDiscountAmount(order.getCouponDiscountAmount());
- export.setVipDiscountAmount(order.getVipDiscountAmount());
- export.setPaymentAmount(order.getPaymentAmount());
- export.setRefundAmount(order.getRefundAmount());
- export.setPhone(order.getPhone());
- export.setOrderSource(getChargingOrderSource(order.getOrderSource()));
- export.setStartTime(formatExportDateTime(order.getStartTime()));
- export.setEndTime(formatExportDateTime(order.getEndTime()));
- exports.add(export);
+ exports.add(buildVipChargingOrderExport(order));
}
writeVipChargingOrderWorkbook(exports);
}
- private String getChargingOrderStatus(Integer status) {
+ static EnterpriseChargingDetailExport buildVipChargingOrderExport(ChargingOrderVO order) {
+ EnterpriseChargingDetailExport export = new EnterpriseChargingDetailExport();
+ export.setCode(order.getCode());
+ export.setOrderType(Integer.valueOf(1).equals(order.getOrderType()) ? "小程序" : "刷卡");
+ export.setOrderClassification("充电订单");
+ export.setSiteName(order.getSiteName());
+ export.setTerminalName(order.getTerminalName());
+ export.setStatus(getChargingOrderStatus(order.getStatus()));
+ export.setChargingSecond(order.getChargingSecond());
+ export.setTotalAmount(order.getOrderAmount());
+ export.setCouponDiscountAmount(order.getCouponDiscountAmount());
+ export.setVipDiscountAmount(order.getVipDiscountAmount());
+ export.setPaymentAmount(order.getPaymentAmount());
+ export.setRefundAmount(order.getRefundAmount());
+ export.setPartnerName(order.getPartnerName());
+ export.setPhone(order.getPhone());
+ export.setOrderSource(getChargingOrderSource(order.getOrderSource()));
+ export.setCreateTime(formatExportDateTime(order.getCreateTime()));
+ export.setStartTime(formatExportDateTime(order.getStartTime()));
+ export.setEndTime(formatExportDateTime(order.getEndTime()));
+ export.setLicensePlate(order.getLicensePlate());
+ export.setChargingCapacity(order.getChargingCapacity());
+ export.setElectrovalence(order.getElectrovalence());
+ export.setServiceCharge(order.getServiceCharge());
+ export.setEndMode(getChargingOrderEndMode(order.getEndMode()));
+ export.setPeriodCount(order.getCount());
+ return export;
+ }
+
+ private static String getChargingOrderStatus(Integer status) {
if (status == null) return "未知";
String[] names = {"未知", "等待中", "启动中", "充电中", "停止中", "已结束"};
return status >= 0 && status < names.length ? names[status] : "未知";
}
- private String getChargingOrderSource(Integer source) {
+ private static String getChargingOrderSource(Integer source) {
if (Integer.valueOf(1).equals(source)) return "明星充电";
if (Integer.valueOf(2).equals(source)) return "快电";
if (Integer.valueOf(3).equals(source)) return "新电途";
return "";
}
+ private static String getChargingOrderEndMode(Integer endMode) {
+ if (endMode == null) return "";
+ String[] names = {"异常终止", "主动终止", "满电终止", "费用不足终止"};
+ return endMode >= 0 && endMode < names.length ? names[endMode] : "";
+ }
+
static String formatExportDateTime(LocalDateTime time) {
return time == null ? "" : DateUtils.localDateTimeToString(time);
}
--
Gitblit v1.7.1