From ae76f22f897cfd438b30829326b6ad36a80eaac0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 21 二月 2025 18:23:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 2f25f87..2194538 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
@@ -210,16 +210,19 @@
if (siteIds.isEmpty()){
siteIds.add(-1);
}
-
+ List<TChargingOrder> list = chargingOrderService.list();
+ List<TParkingRecord> parkingRecord = parkingLotClient.getSiteIdAll().getData();
for (PayOrderDto record : data.getRecords()) {
if (record.getType() == 1){
- TChargingOrder byId = chargingOrderService.getById(record.getId());
- record.setSiteId(byId.getSiteId());
+ TChargingOrder chargingOrder = list.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
+ if (chargingOrder!=null){
+ record.setSiteId(chargingOrder.getSiteId());
+ }
}
if (record.getType()==4){
- Integer siteId=parkingLotClient.getSiteIdByOrderId(Long.valueOf(record.getId())).getData();
- if (siteId!=null){
- record.setSiteId(siteId);
+ TParkingRecord tParkingRecord = parkingRecord.stream().filter(e -> e.getId().equals(Long.valueOf(record.getId()))).findFirst().orElse(null);
+ if (tParkingRecord!=null){
+ record.setSiteId(tParkingRecord.getSiteId());
}
}
if (roleType==1||(record.getType()!=1&&record.getType()!=4)){
@@ -757,6 +760,18 @@
@RequestParam("transaction_id") String transaction_id,
@RequestParam("attach") String attach) {
chargingOrderService.chargingOrderCallback(2, out_trade_no, transaction_id, attach);
+ }
+
+
+ /**
+ *
+ * @param code
+ */
+ @ResponseBody
+ @PostMapping(value = "/refund")
+ public R refund(@RequestParam(value = "code") String code){
+ chargingOrderService.refund(code);
+ return R.ok();
}
@@ -2186,4 +2201,16 @@
public R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq){
return chargingOrderService.tripartitePlatformStopCharge(startChargeSeq);
}
+
+
+ /**
+ * 临时接口
+ * 获取充电后没有扣除费用的数据
+ * @return
+ */
+ @GetMapping("/getNotPaymentChargingOrder")
+ public R getNotPaymentChargingOrder(){
+ return chargingOrderService.getNotPaymentChargingOrder();
+ }
+
}
--
Gitblit v1.7.1