From a208b51bccff584689dc918e799c63febbcae832 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 12 十月 2024 11:56:33 +0800
Subject: [PATCH] 修改bug

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 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..09a7d53 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
@@ -15,6 +15,7 @@
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -34,7 +35,7 @@
      * @param query
      * @return
      */
-    List<MyShoppingOrderList> getMyShoppingOrderList(GetMyShoppingOrderList query);
+    Map<String, Object> getMyShoppingOrderList(GetMyShoppingOrderList query);
     
     
     /**
@@ -54,6 +55,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
@@ -67,4 +80,6 @@
     List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);
 
     BigDecimal getSumAmount(LocalDate sixBefore);
+
+    List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto);
 }

--
Gitblit v1.7.1