From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改

---
 fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java |   94 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 93 insertions(+), 1 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 c6ffbc8..b4cc256 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);
@@ -99,6 +101,19 @@
 	public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime);
 
 	/**
+	 * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+	 * @param uid
+	 * @param type
+	 * @param day
+	 * @param startTime
+	 * @param endTime
+	 * @return
+	 */
+	public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime,
+			String endTime);
+
+	
+	/**
 	 * 鏍规嵁鏉′欢缁熻
 	 * 
 	 * @param uid
@@ -137,6 +152,83 @@
 	 * @param maxDate
 	 * @return
 	 */
-	long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+	public long countByUidAndOrderStateWithOrderBalanceTime(Long uid, int state, Date minDate, Date maxDate);
+
+	/**
+	 * 鍚庣鏌ヨ璁㈠崟鍒楄〃
+	 * @param start
+	 * @param count
+	 * @param uid
+	 * @param state
+	 * @param type
+	 * @param orderState
+	 * @param orderNo
+	 * @param startTime
+	 * @param endTime
+	 * @param dateType 1鏄ㄥぉ  2浠婂ぉ 3鏈湀 4 涓婃湀
+	 * @return
+	 * @throws CommonOrderException
+	 */
+	public List<CommonOrderVO> listQueryByUid(long start, int count, 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);
 
 }

--
Gitblit v1.8.0