From 404c34cdcb58df5aab92fb29da5bc7d198a8f5d8 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 十一月 2024 08:47:36 +0800
Subject: [PATCH] 合并代码

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 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 fe828dd..99548af 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
@@ -19,6 +19,7 @@
 import com.ruoyi.chargingPile.api.model.Site;
 import com.ruoyi.chargingPile.api.model.TChargingGun;
 import com.ruoyi.chargingPile.api.model.TChargingPile;
+import com.ruoyi.chargingPile.api.model.TParkingRecord;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.dto.ChargingOrderGroup;
 import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
@@ -197,6 +198,7 @@
                 payOrderInfoDto.setPayTime(byId.getCreateTime());
                 payOrderInfoDto.setRefundAmount(byId.getRefundAmount());
                 payOrderInfoDto.setRechargeAmount(byId.getRechargeAmount());
+                payOrderInfoDto.setFinalAmount(byId.getRechargeAmount().subtract(byId.getRefundAmount()));
                 return R.ok(payOrderInfoDto);
             case 2:
                 TShoppingOrder byId1 = shoppingOrderService.getById(orderId);
@@ -209,6 +211,7 @@
                 payOrderInfoDto1.setPayTime(byId1.getCreateTime());
                 payOrderInfoDto1.setRefundAmount(byId1.getRefundAmount());
                 payOrderInfoDto1.setRechargeAmount(byId1.getPaymentAmount());
+                payOrderInfoDto1.setFinalAmount(byId1.getPaymentAmount().subtract(byId1.getRefundAmount()));
                 return R.ok(payOrderInfoDto1);
             case 3:
                 TVipOrder byId2 = vipOrderService.getById(orderId);
@@ -221,19 +224,18 @@
                 payOrderInfoDto2.setPayTime(byId2.getCreateTime());
                 payOrderInfoDto2.setRefundAmount(byId2.getRefundAmount());
                 payOrderInfoDto2.setRechargeAmount(byId2.getPaymentAmount());
+                payOrderInfoDto2.setFinalAmount(byId2.getPaymentAmount().subtract(byId2.getRefundAmount()));
                 return R.ok(payOrderInfoDto2);
             //todo luo 停车场订单
-//                case 4:
-//                    TParkingRecord byId3 = parkingLotClient.getRecordById(orderId).getData();
-//                    PayOrderInfoDto payOrderInfoDto3 = new PayOrderInfoDto();
-//                    payOrderInfoDto3.setOrderId(byId3.getId().toString());
-//                    payOrderInfoDto3.setCode(byId3.getCode());
-//                    payOrderInfoDto3.setTradeNo(byId3);
-//                    payOrderInfoDto3.setPayType(0);
-//                    payOrderInfoDto3.setPayAmount(new BigDecimal("0"));
-//                    payOrderInfoDto3.setPayTime(LocalDateTime.now());
-//                    payOrderInfoDto3.setRefundAmount(new BigDecimal("0"));
-
+                case 4:
+                    R<TParkingRecord> recordById = parkingLotClient.getRecordById(orderId);
+                    TParkingRecord byId3 =recordById.getData();
+                    PayOrderInfoDto payOrderInfoDto3 = new PayOrderInfoDto();
+                    payOrderInfoDto3.setOrderId(byId3.getId().toString());
+                    payOrderInfoDto3.setCode(byId3.getCode());
+                    payOrderInfoDto3.setPayTime(byId3.getCreateTime());
+                    payOrderInfoDto3.setRechargeAmount(byId3.getPayment());
+                    return R.ok(payOrderInfoDto3);
 
 
 
@@ -1861,4 +1863,20 @@
         List<TChargingOrder> chargingOrder = chargingOrderService.getChargingOrder(order);
         return R.ok(chargingOrder);
     }
+    
+    
+    /**
+     * 根据车辆id获取指定时间范围内的数据
+     * @param carId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    @PostMapping("/getCarChargingOrder")
+    public R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime){
+        List<TChargingOrder> list = chargingOrderService.list(new LambdaQueryWrapper<TChargingOrder>().eq(TChargingOrder::getAppUserCarId, carId).eq(TChargingOrder::getDelFlag, 0)
+                .in(TChargingOrder::getStatus, Arrays.asList(4, 5)).between(TChargingOrder::getStartTime, startTime, endTime));
+        return R.ok(list);
+    }
+    
 }

--
Gitblit v1.7.1