From c4664502dfdaffff555b532e65b51a57ac8b29c2 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 16 十月 2024 17:51:32 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 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 70a4616..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
@@ -4,17 +4,18 @@
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.order.api.model.TShoppingOrder;
+import com.ruoyi.order.api.query.ShoppingOrderQuery;
import com.ruoyi.order.api.query.TActivityStatisticsQuery;
import com.ruoyi.order.api.vo.TActivityStatisticslVO;
import com.ruoyi.order.api.vo.TActivityVO;
-import com.ruoyi.order.dto.GetMyShoppingOrderList;
-import com.ruoyi.order.dto.GetNoInvoicedOrder;
-import com.ruoyi.order.dto.MyShoppingOrderInfo;
-import com.ruoyi.order.dto.MyShoppingOrderList;
+import com.ruoyi.order.dto.*;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
+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
@@ -61,4 +74,12 @@
List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);
void callBack(String code,String outTradeNo);
+
+ PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query);
+
+ List<SixShopDto> sixBefore(LocalDate sixBefore, Integer status);
+
+ BigDecimal getSumAmount(LocalDate sixBefore);
+
+ List<Map<String, Object>> getData(ChargingStatisticsQueryDto statisticsQueryDto);
}
--
Gitblit v1.7.1