From 7a4f9541331bef779a506b38a27ed5c3373c0bec Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 15 五月 2025 13:53:22 +0800
Subject: [PATCH] 开发二级等保功能及心跳消息队列修改

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
index c75e0b8..4d30354 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java
@@ -14,7 +14,9 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,7 +36,7 @@
      * @param query
      * @return
      */
-    List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query);
+    Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query);
     
     
     /**
@@ -54,6 +56,18 @@
     
     
     /**
+     * 商城订单取消订单微信退款处理
+     * @param out_refund_no 退款单号
+     * @param refund_id 退款流水号
+     * @param refund_status 退款状态 SUCCESS:退款成功  CLOSED:退款关闭  ABNORMAL:退款异常
+     * @param success_time 退款成功时间
+     * @return
+     */
+    AjaxResult cancelShoppingOrderWxRefund(String out_refund_no, String refund_id, String refund_status, String success_time);
+    
+    
+    
+    /**
      * 获取未开票的订单列表
      * @param query
      * @return
@@ -66,5 +80,7 @@
 
     List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);
 
-    BigDecimal getSumAmount(LocalDate sixBefore);
+    BigDecimal getSumAmount();
+
+    List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto);
 }

--
Gitblit v1.7.1