From aa7727d8ed9eca34f8126c3dc5a80fbdf9ad56cd Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期三, 11 九月 2024 12:02:57 +0800
Subject: [PATCH] 添加系统日志
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
index 8fe4c9a..9ccfa94 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java
@@ -19,6 +19,7 @@
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.api.dto.SettlementConfirmAdd;
+import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.SettlementListQuery;
@@ -30,7 +31,6 @@
import com.ruoyi.order.export.TChargingOrderExport;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
-import com.ruoyi.order.api.model.ChargingListQuery;
import com.ruoyi.order.service.*;
import com.ruoyi.payment.api.feignClient.AliPaymentClient;
import com.ruoyi.payment.api.feignClient.WxPaymentClient;
@@ -81,7 +81,7 @@
return AjaxResult.success(res);
}
@ApiOperation(value = "充电时段统计-导出", tags = {"管理后台-财务结算"})
- @PostMapping("/export")
+ @PutMapping("/export")
public void export(@RequestBody ChargingListQuery dto)
{
ChargingOrderTimeVO res = chargingOrderService.chargingList(dto);
@@ -118,13 +118,15 @@
}
@GetMapping(value = "/settlementTotal")
@ApiOperation(value = "结算汇总-列表查询", tags = {"管理后台-财务结算"})
- @ApiParam(name = "time", value = "汇报时间2024-01-01 00:00:00")
+ @ApiParam(name = "time", value = "汇报时间2024-01")
public AjaxResult<SettlementTotalVO> settlementTotal(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return AjaxResult.success(res);
}
@GetMapping(value = "/settlementTotalR")
- public R<SettlementTotalVO> settlementTotalR( String time) {
+ public R<SettlementTotalVO> settlementTotalR(String time) {
+ time = time+"-01 00:00:00";
SettlementTotalVO res = chargingOrderService.settlementTotal(time);
return R.ok(res);
}
--
Gitblit v1.7.1