From 4132f870d80d531771b61bb0e45ff575857a7625 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 26 十月 2024 09:01:15 +0800
Subject: [PATCH] bug修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 2 --
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 2 +-
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java | 6 ++----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
index c1b037f..ae00e91 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java
@@ -245,14 +245,12 @@
chargingBillExport.setCode(byId.getCode());
chargingBillExport.setAccountType("微信商户");
chargingBillExport.setType(byId.getType().toString());
- chargingBillExport.setBillType("月账单");
LocalDateTime billTime = byId.getBillTime();
// 将billTime 减去一个月 转化为yyyy-MM格式字符串
billTime = billTime.minusMonths(1);
chargingBillExport.setBillWeek(DateUtils.parseDateToStr("yyyy-MM",DateUtils.toDate(billTime)));
chargingBillExport.setBillTime(DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss",DateUtils.toDate(billTime)));
- chargingBillExport.setState("未出账");
List<Site> data = siteClient.getSiteByIds(Arrays.asList(byId.getSiteId())).getData();
if (!data.isEmpty()){
chargingBillExport.setSiteName(data.get(0).getName());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
index 3c826b2..44efc03 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/export/ChargingBillExport.java
@@ -17,14 +17,12 @@
private String accountType;
@Excel(name = "账单分类",width = 30,replace = {"全站账单_1","各个站点账单_2"})
private String type;
- @Excel(name = "账单类型",width = 30)
- private String billType;
+
@Excel(name = "账单周期",width = 30 )
private String billWeek;
@Excel(name = "账单生成日期",width = 30)
private String billTime;
- @Excel(name = "状态",width = 30)
- private String state;
+
@Excel(name = "站点名称",width = 30)
private String siteName;
@Excel(name = "支付金额",width = 30)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
index 37f8bac..dd63798 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java
@@ -128,7 +128,7 @@
tChargingBill3.setType(2);
tChargingBill3.setSiteId(collect.get(i));
tChargingBill3.setBillTime(LocalDateTime.now());
- tChargingBill3.setBillType(1);
+ tChargingBill3.setBillType(2);
tChargingBill3.setStatus(1);
tChargingBill3.setOrderState(2);
tChargingBills1.add(tChargingBill3);
--
Gitblit v1.7.1