From 26b5b1a6bbbb5ff64dc2ec73cf8b11f1aa61c1c5 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 14 五月 2019 11:03:25 +0800
Subject: [PATCH] Merge branch 'div_8'
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 85 ++++++++++++++++++++++++++++++++++++++++--
1 files changed, 80 insertions(+), 5 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 43c29a1..0ad7a3d 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
@@ -10,6 +10,8 @@
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import net.sf.json.JSONObject;
+
public interface CommonOrderService {
public int insert(CommonOrder record);
@@ -100,6 +102,7 @@
/**
* 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+ *
* @param uid
* @param type
* @param day
@@ -110,7 +113,6 @@
public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
String endTime);
-
/**
* 鏍规嵁鏉′欢缁熻
*
@@ -141,9 +143,9 @@
*/
public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
-
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
+ *
* @param uid
* @param state
* @param minDate
@@ -154,6 +156,7 @@
/**
* 鍚庣鏌ヨ璁㈠崟鍒楄〃
+ *
* @param start
* @param count
* @param uid
@@ -163,7 +166,8 @@
* @param orderNo
* @param startTime
* @param endTime
- * @param dateType 1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀
+ * @param dateType
+ * 1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀
* @return
* @throws CommonOrderException
*/
@@ -171,7 +175,78 @@
Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
throws CommonOrderException;
- public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo, String startTime,
- String endTime, Integer dateType) throws CommonOrderException;
+ public long countQueryByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
+ String startTime, String endTime, Integer dateType) throws CommonOrderException;
+
+ /**
+ * 鏌ヨ鎵�鏈夌敤鎴疯鍗�
+ *
+ * @param start
+ * @param count
+ * @param keyType
+ * @param key
+ * @param state
+ * @param type
+ * @param orderState
+ * @param startTime
+ * @param endTime
+ * @return
+ * @throws CommonOrderException
+ */
+
+ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state,
+ Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException;
+
+ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ String startTime, String endTime) throws CommonOrderException;
+
+ /**
+ * 鏍规嵁璁㈠崟鍙疯幏鍙栦俊鎭�
+ *
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public CommonOrderVO getInfoByOrderNo(Long uid, String orderNo) throws CommonOrderException;
+
+ /**
+ * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭�
+ *
+ * @param uid
+ * @param state
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo)
+ throws CommonOrderException;
+
+ /**
+ * 鏌ヨ璁㈠崟
+ *
+ * @param uid
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState)
+ throws CommonOrderException;
+
+ /**
+ * 浣跨敤濂栧姳鍒告垚鍔熷悗璺宠浆 淇敼
+ *
+ * @param orderNo
+ * @return
+ */
+ public JSONObject getRewardJumpInfo(String orderNo);
+
+ /**
+ * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
+ *
+ * @param sourceType
+ * @param tradeId
+ * @return
+ */
+ public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);
}
--
Gitblit v1.8.0