From 404ae2f53b9107abc107fb56bb1c1d0e89e6363b Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 24 十月 2024 15:44:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/ChargingBillController.java | 9 +++------
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/util/task/TaskUtil.java | 2 +-
2 files changed, 4 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 6288179..da2f83b 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
@@ -231,6 +231,7 @@
}
}
}
+
@ApiOperation(value = "下载-未出账", tags = {"管理后台-充电算账单"})
@PutMapping("/download")
public void download(@RequestBody ExportUidDto uid)
@@ -241,8 +242,7 @@
TChargingBill byId = chargingBillService.getById(uid.getUid());
ChargingBillExport chargingBillExport = new ChargingBillExport();
chargingBillExport.setCode(byId.getCode());
- // todo 确认商户类型
- chargingBillExport.setAccountType("商户类型");
+ chargingBillExport.setAccountType("微信商户");
chargingBillExport.setType(byId.getType().toString());
chargingBillExport.setBillType("月结");
LocalDateTime billTime = byId.getBillTime();
@@ -274,7 +274,6 @@
}
BigDecimal paymentAmount = new BigDecimal("0");
BigDecimal refundAmount = new BigDecimal("0");
- BigDecimal income = new BigDecimal("0");
List<TChargingOrder> tChargingOrders = chargingOrderService.list(eq);
// 累加支付金额
@@ -332,9 +331,7 @@
// 导出
List<Map<String, Object>> sheetsList = new ArrayList<>();
- AtomicInteger atomicInteger = new AtomicInteger();
-
- for (int i1 = 0; i1 < 3; i1++) {
+ for (int i1 = 1; i1 <= 3; i1++) {
String sheetName="";
switch (i1){
case 1:
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 72c7985..de82b18 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
@@ -52,7 +52,7 @@
// 每天凌晨12点执行的定时任务
-@Scheduled(cron = "0 0 12 1 * ?")
+@Scheduled(cron = "0 0 12 * * ?")
//@Scheduled(fixedRate = 60000)
public void taskMonth() {
try {
--
Gitblit v1.7.1