From f0da95925bcb8ad19b0d1cc78afe4b4a4ae188a6 Mon Sep 17 00:00:00 2001
From: p-honggang.li <p-honggang.li@pcitc.com>
Date: 星期四, 28 八月 2025 09:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://xearth.cn:6600/r/web-manage/web-manage-back
---
src/main/java/com/webmanage/mapper/OrderInfoMapper.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/webmanage/mapper/OrderInfoMapper.java b/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
index e019bcb..055b06f 100644
--- a/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
+++ b/src/main/java/com/webmanage/mapper/OrderInfoMapper.java
@@ -16,8 +16,8 @@
/**
* 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃
*/
- IPage<OrderInfo> selectBuyerOrderPage(Page<OrderInfo> page, @Param("userId") Long userId,
- @Param("unitId") Long unitId, @Param("orderStatus") String orderStatus,
+ IPage<OrderInfo> selectBuyerOrderPage(Page<OrderInfo> page, @Param("userId") String userId,
+ @Param("unitId") String unitId, @Param("orderStatus") String orderStatus,
@Param("paymentStatus") String paymentStatus, @Param("paymentType") String paymentType,
@Param("productName") String productName, @Param("providerName") String providerName,
@Param("orderId") String orderId, @Param("applyTimeStart") String applyTimeStart,
@@ -28,7 +28,7 @@
/**
* 鍒嗛〉鏌ヨ鍗栧璁㈠崟鍒楄〃
*/
- IPage<OrderInfo> selectSellerOrderPage(Page<OrderInfo> page, @Param("providerId") Long providerId,
+ IPage<OrderInfo> selectSellerOrderPage(Page<OrderInfo> page, @Param("providerId") String providerId,
@Param("orderStatus") String orderStatus, @Param("paymentStatus") String paymentStatus,
@Param("productName") String productName, @Param("orderId") String orderId,
@Param("applyTimeStart") String applyTimeStart, @Param("applyTimeEnd") String applyTimeEnd,
@@ -43,4 +43,26 @@
@Param("orderId") String orderId, @Param("applyTimeStart") String applyTimeStart,
@Param("applyTimeEnd") String applyTimeEnd, @Param("orderBy") String orderBy,
@Param("orderDirection") String orderDirection);
+
+ /**
+ * 鍒嗛〉鏌ヨ涔板璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級
+ */
+ IPage<OrderInfo> selectBuyerOrderPageWithProductConditions(Page<OrderInfo> page, @Param("userId") String userId,
+ @Param("unitId") String unitId, @Param("orderStatus") String orderStatus,
+ @Param("paymentStatus") String paymentStatus, @Param("paymentType") String paymentType,
+ @Param("productName") String productName, @Param("providerName") String providerName,
+ @Param("orderId") String orderId, @Param("applyTimeStart") String applyTimeStart,
+ @Param("applyTimeEnd") String applyTimeEnd, @Param("createTimeStart") String createTimeStart,
+ @Param("createTimeEnd") String createTimeEnd, @Param("orderBy") String orderBy,
+ @Param("orderDirection") String orderDirection, @Param("productIds") java.util.List<String> productIds);
+
+ /**
+ * 鍒嗛〉鏌ヨ鍗栧璁㈠崟鍒楄〃锛堟敮鎸佷骇鍝佹潯浠讹級
+ */
+ IPage<OrderInfo> selectSellerOrderPageWithProductConditions(Page<OrderInfo> page, @Param("providerId") String providerId,
+ @Param("orderStatus") String orderStatus, @Param("paymentStatus") String paymentStatus,
+ @Param("productName") String productName, @Param("orderId") String orderId,
+ @Param("applyTimeStart") String applyTimeStart, @Param("applyTimeEnd") String applyTimeEnd,
+ @Param("createTimeStart") String createTimeStart, @Param("createTimeEnd") String createTimeEnd,
+ @Param("orderBy") String orderBy, @Param("orderDirection") String orderDirection, @Param("productIds") java.util.List<String> productIds);
}
--
Gitblit v1.8.0