From 57d1bdeba6f744f0da9c3d1e01e54263ec2d19d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 07 九月 2024 10:48:21 +0800
Subject: [PATCH] 代码提交
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/FinancialSettlementController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 3ec44b2..b272feb 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
@@ -13,6 +13,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.TChargingOrder;
import com.ruoyi.order.api.model.TSettlementConfirm;
import com.ruoyi.order.api.query.SettlementListQuery;
import com.ruoyi.order.vo.ChargingOrderListInfoVO;
@@ -28,6 +29,8 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
/**
* <p>
@@ -79,7 +82,18 @@
}
@GetMapping(value = "/downloadSettlement/{uid}")
public R<TSettlementConfirm> downloadSettlement(@PathVariable("uid") String uid) {
- return R.ok(tSettlementConfirmService.getById(uid));
+ TSettlementConfirm byId = tSettlementConfirmService.getById(uid);
+ if (byId!=null){
+ List<TChargingOrder> list = chargingOrderService.lambdaQuery().eq(TChargingOrder::getSiteId, byId.getSiteId())
+ .between(TChargingOrder::getStartTime, byId.getStartTime(), byId.getEndTime())
+ .eq(TChargingOrder::getStatus, 5)
+ .eq(TChargingOrder::getRechargePaymentStatus, 2).list();
+ byId.setList(list);
+ String format = byId.getStartTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+ String format1 = byId.getEndTime().format(DateTimeFormatter.ofPattern("yyyy年MM月dd日HH:mm:ss"));
+ byId.setTime(format+"至"+format1);
+ }
+ return R.ok(byId);
}
}
--
Gitblit v1.7.1