From 2f5935ed11672046c37f733d855214f6147b4b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 28 三月 2022 11:33:19 +0800
Subject: [PATCH] TDMQ兼容
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
index 0eb4503..80385fb 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java
@@ -244,7 +244,7 @@
* @param keyType
* @param key
* @param state
- * @param type
+ * @param typeList
* @param orderState
* @param startTime
* @param endTime
@@ -253,11 +253,11 @@
*/
public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
- Integer type, Integer orderState, String startTime, String endTime, Integer source,
+ List<Integer> typeList, Integer orderState, String startTime, String endTime, Integer source,
List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system)
throws CommonOrderException;
- public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ public long countQuery(Integer keyType, String key, Integer state, List<Integer> typeList, Integer orderState,
String startTime, String endTime, Integer source,
List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money, BigDecimal payment, SystemEnum system) throws CommonOrderException;
@@ -278,7 +278,7 @@
* @param orderNo
* @return
*/
- public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType);
+ public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType, SystemEnum system);
/**
* 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
@@ -516,4 +516,15 @@
*/
public List<CommonOrder> listByGoodsIdAndUidAndMinThirdCreateTime(Long goodsId, Long uid, Date minThirdCreateTime);
+
+ /**
+ * 鑾峰彇澶勪簬宸蹭粯娆剧姸鎬佺殑璁㈠崟
+ *
+ * @param sourceType 璁㈠崟鏉ユ簮绫诲瀷
+ * @param minThirdCreateTime 鏈�灏忕涓夋柟鍒涘缓鏃堕棿
+ * @param maxThirdCreateTime 鏈�澶х涓夋柟鍒涘缓鏃堕棿
+ * @return
+ */
+ public List<CommonOrder> listPayStateOrder(int sourceType, Date minThirdCreateTime, Date maxThirdCreateTime);
+
}
--
Gitblit v1.8.0