From 2e43d137c7832e149f3df4145aa7fcca2153ef9c Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 31 八月 2024 16:52:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java |   78 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
index d4b0897..23d19a3 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java
@@ -1,14 +1,23 @@
 package com.ruoyi.order.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.dto.ChargingOrderGroup;
+import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
+import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.BasePage;
+import com.ruoyi.common.core.web.page.PageInfo;
 import com.ruoyi.order.api.model.TChargingOrder;
-import com.ruoyi.order.dto.GetMyChargingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyChargingOrderInfo;
-import com.ruoyi.order.dto.MyChargingOrderList;
+import com.ruoyi.order.api.model.TChargingOrderRefund;
+import com.ruoyi.order.api.query.ChargingOrderQuery;
+import com.ruoyi.order.api.vo.ChargingOrderTimeVO;
+import com.ruoyi.order.api.vo.ChargingOrderVO;
+import com.ruoyi.order.api.vo.TCharingOrderVO;
+import com.ruoyi.order.dto.*;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.Map;
 
@@ -45,4 +54,65 @@
 	 * @return
 	 */
 	List<MyChargingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);
+	
+	
+	/**
+	 * 充电支付
+	 * @param addChargingOrder
+	 * @return
+	 */
+	AjaxResult paymentChargingOrder(AddChargingOrder addChargingOrder);
+	
+	
+	/**
+	 * 支付成功后的回调处理逻辑
+	 * @param paymentType 支付方式：1=微信，2=支付宝
+	 * @param out_trade_no 业务流水号
+	 * @param transaction_id 三方支付流水号
+	 * @param attach 附加数据
+	 * @return
+	 */
+	AjaxResult chargingOrderCallback(Integer paymentType, String out_trade_no, String transaction_id, String attach);
+	
+	
+	/**
+	 * 获取充电中的详情
+	 * @param id
+	 * @return
+	 */
+	ChargingDetails getChargingDetails(Integer id);
+	
+	
+	/**
+	 * 停止充电
+	 * @param id
+	 * @return
+	 */
+	AjaxResult stopCharging(String id);
+
+	TCharingOrderVO chargingOrder(ChargingOrderQuery dto);
+
+	R<PageInfo<PayOrderDto>> payOrderQuery(PayOrderQueryDto payOrderQueryDto);
+
+    R<PageInfo<TChargingOrderRefund>> getRefundList(ChargingRefundDto chargingRefundDto);
+
+    List<ChargingOrderGroup> chargingOrderGroup(ChargingPercentProvinceDto chargingPercentProvinceDto);
+
+	List<SixChargingDto> charge(LocalDate sixBefore, List<Integer> siteIds);
+
+	List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore);
+
+	Map<String, BigDecimal> countAll(LocalDate sixBefore);
+
+    List<Map<String, BigDecimal>> getSumByType(List<Long> chargingOrderIds);
+
+	List<Map<String, BigDecimal>> getDateData(List<Long> chargingOrderIds);
+
+	List<Map<String, BigDecimal>> getWeekData(List<Long> chargingOrderIds);
+
+	List<Map<String, BigDecimal>> getMonthData(List<Long> chargingOrderIds);
+
+	List<Map<String, BigDecimal>> getYearData(List<Long> chargingOrderIds);
+
+    ChargingOrderTimeVO chargingList(ChargingListQuery dto);
 }

--
Gitblit v1.7.1