From 880c2a2bc0f60d0b2af43dad62f728f29fd5bf0a Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 26 八月 2024 14:19:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TShoppingOrderService.java | 6 ++++++
1 files changed, 6 insertions(+), 0 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 c503367..a103b1d 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,6 +4,7 @@
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;
@@ -59,4 +60,9 @@
* @return
*/
List<MyShoppingOrderList> getNoInvoicedOrder(GetNoInvoicedOrder query);
+
+ void callBack(String code,String outTradeNo);
+
+ PageInfo<TShoppingOrder> pageList(ShoppingOrderQuery query);
+
}
--
Gitblit v1.7.1