From d28bed1a1275131a5ca37f7da37961e2b518ac07 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 13:44:00 +0800
Subject: [PATCH] 淘礼金创建异常处理
---
fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 162 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 152 insertions(+), 10 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..bf71268 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
@@ -5,10 +5,15 @@
import java.util.List;
import java.util.Map;
+import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.jd.JDOrder;
import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.entity.pdd.PDDOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+
+import net.sf.json.JSONObject;
public interface CommonOrderService {
@@ -42,7 +47,7 @@
* @throws CommonOrderException
*/
public List<CommonOrderVO> listGroupOrderNoByUid(long start, int count, Long uid, Integer state, Integer type,
- Integer orderState, String orderNo, String startTime, String endTime, Integer dateType)
+ Integer orderState, String orderNo, String startTime, String endTime, Integer dateType, Integer source)
throws CommonOrderException;
/**
@@ -58,7 +63,7 @@
* @throws CommonOrderException
*/
long countGroupOrderNoByUid(Long uid, Integer state, Integer type, Integer orderState, String orderNo,
- String startTime, String endTime, Integer dateType) throws CommonOrderException;
+ String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException;
/**
* 绉诲姩娈佃鍗曞垪琛�
@@ -71,8 +76,8 @@
* 鍒拌处鐘舵��
* @return
*/
- public List<CommonOrderVO> getOrderByUid(Integer page, Long uid, Integer state, Integer type, Integer orderState,
- String orderNo, String startTime, String endTime, Integer dateType) throws CommonOrderException;
+ public List<CommonOrderVO> getOrderByUid(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type, Integer orderState,
+ String orderNo, String startTime, String endTime, Integer dateType, Integer source) throws CommonOrderException;
/**
* 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩
@@ -80,7 +85,7 @@
* @param uid
* @return
*/
- public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day);
+ public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source);
/**
* 缁熻璁㈠崟
@@ -88,7 +93,7 @@
* @param uid
* @return
*/
- public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime);
+ public long countBonusOrderNumber(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source);
/**
* 缁熻璁㈠崟
@@ -96,7 +101,20 @@
* @param uid
* @return
*/
- public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime);
+ public BigDecimal countBonusOrderMoney(Long uid, Integer type, Integer isToday, String startTime, String endTime, Integer source);
+
+ /**
+ * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰�
+ *
+ * @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, Integer source);
/**
* 鏍规嵁鏉′欢缁熻
@@ -108,7 +126,7 @@
* @return
*/
public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime,
- Integer day);
+ Integer day, Integer source);
/**
* 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟
@@ -120,23 +138,147 @@
public List<CommonOrder> listBySourceTypeAndOrderId(int sourceType, String orderId);
/**
- * 缂撳瓨鏅�氳鍗�
+ * 缂撳瓨娣樺疂绫绘櫘閫氳鍗�
*
* @param taoBaoOrder
* @param uid
* @return
+ * @throws CommonOrderException
*/
public List<CommonOrder> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException;
+ /**
+ * 缂撳瓨鎷煎澶氱被鏅�氳鍗�
+ *
+ * @param pddOrderList
+ * @param uid
+ * @return
+ * @throws CommonOrderException
+ */
+ public List<CommonOrder> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException;
+
+ /**
+ * 缂撳瓨浜笢鏅�氳鍗�
+ *
+ * @param jdOrderList
+ * @param uid
+ * @return
+ * @throws CommonOrderException
+ */
+ public List<CommonOrder> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException;
/**
* 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺
+ *
* @param uid
* @param state
* @param minDate
* @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, Integer source) throws CommonOrderException;
+
+ public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState,
+ String startTime, String endTime, Integer source) throws CommonOrderException;
+ /**
+ * 鏌ヨ璁㈠崟
+ *
+ * @param uid
+ * @param orderNo
+ * @return
+ * @throws CommonOrderException
+ */
+ public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType)
+ throws CommonOrderException;
+
+ /**
+ * 浣跨敤濂栧姳鍒告垚鍔熷悗璺宠浆 淇敼
+ *
+ * @param orderNo
+ * @return
+ */
+ public JSONObject getRewardJumpInfo(String orderNo);
+
+ /**
+ * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯�
+ *
+ * @param sourceType
+ * @param tradeId
+ * @return
+ */
+ public CommonOrder selectBySourceTypeAndTradeId(int sourceType, String tradeId);
+
+ /**
+ * 鍒犻櫎閿欒璁㈠崟
+ *
+ * @param coId
+ */
+ public void deleteErrorCommonOrder(Long coId);
+
+ /**
+ * 鏍规嵁璁㈠崟绫诲瀷涓庝氦鏄揑D鏌ヨ
+ *
+ * @param sourceType
+ * @param tradeId
+ * @return
+ */
+ public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId);
+
+ /**
+ * 鏍规嵁鏉′欢鏌ヨ璁㈠崟
+ *
+ * @param sourceType
+ * @param state
+ * @param minTime
+ * @param maxTime
+ * @param page
+ * @param pageSize
+ * @return
+ */
+ List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime,
+ Long maxTime, int page, int pageSize);
}
--
Gitblit v1.8.0