From d039f7c8ce54963b3513293dc923771971f16a72 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 29 四月 2026 19:47:40 +0800
Subject: [PATCH] feat:冒烟修改
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 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 972893d..a8f1216 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
@@ -277,6 +277,11 @@
payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
payOrderInfoDto.setRechargeAmount(byId.getRechargeAmount());
payOrderInfoDto.setFinalAmount(byId.getRechargeAmount().subtract(byId.getRefundAmount()));
+ payOrderInfoDto.setPayMethod(byId.getPayMethod());
+ payOrderInfoDto.setBalancePayAmount(byId.getBalancePayAmount());
+ payOrderInfoDto.setThirdPayAmount(byId.getThirdPayAmount());
+ payOrderInfoDto.setBalanceRefundAmount(byId.getBalanceRefundAmount());
+ payOrderInfoDto.setThirdRefundAmount(byId.getThirdRefundAmount());
return R.ok(payOrderInfoDto);
case 2:
TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
@@ -525,6 +530,16 @@
}
+ @RequiresPermissions(value = {"/chargingPileOrder"}, logical = Logical.OR)
+ @ResponseBody
+ @PostMapping(value = "/balanceIncomeDetail")
+ @ApiOperation(value = "充电桩订单余额收入明细", tags = {"管理后台-订单管理"})
+ public AjaxResult<List<ChargingOrderBalanceIncomeDetailVO>> balanceIncomeDetail(@RequestBody ChargingOrderQuery dto) {
+ List<ChargingOrderBalanceIncomeDetailVO> res = chargingOrderService.balanceIncomeDetail(dto);
+ return AjaxResult.success(res);
+ }
+
+
@RequiresPermissions(value = {"/chargingPileOrder/monitoring_record"}, logical = Logical.OR)
@ResponseBody
@GetMapping(value = "/chargingOrderInfo")
--
Gitblit v1.7.1