From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 09 七月 2019 17:53:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 83 +++++++++++++++++++++++++++++++++++------ 1 files changed, 70 insertions(+), 13 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 b4cc256..ac512ce 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,7 +5,9 @@ import java.util.List; import java.util.Map; +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; @@ -102,6 +104,7 @@ /** * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� + * * @param uid * @param type * @param day @@ -112,7 +115,6 @@ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, String endTime); - /** * 鏍规嵁鏉′欢缁熻 * @@ -135,17 +137,38 @@ 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 @@ -156,6 +179,7 @@ /** * 鍚庣鏌ヨ璁㈠崟鍒楄〃 + * * @param start * @param count * @param uid @@ -165,7 +189,8 @@ * @param orderNo * @param startTime * @param endTime - * @param dateType 1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀 + * @param dateType + * 1鏄ㄥぉ 2浠婂ぉ 3鏈湀 4 涓婃湀 * @return * @throws CommonOrderException */ @@ -173,11 +198,12 @@ 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 @@ -190,15 +216,16 @@ * @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; + 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 @@ -207,28 +234,58 @@ /** * 鏌ヨ鍒稿鍔遍噾棰濅互鍙婅鍗曚俊鎭� + * * @param uid * @param state * @param orderNo * @return * @throws CommonOrderException */ - public List<CommonOrderVO> getCouponHongbaoByOrderNo(Long uid, Integer state, String orderNo) 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; + 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); + + /** + * 鍒犻櫎閿欒璁㈠崟 + * + * @param coId + */ + public void deleteErrorCommonOrder(Long coId); + + /** + * 鏍规嵁璁㈠崟绫诲瀷涓庝氦鏄揑D鏌ヨ + * + * @param sourceType + * @param tradeId + * @return + */ + public List<CommonOrder> listBySourceTypeAndTradeId(int sourceType, String tradeId); + } -- Gitblit v1.8.0