From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 25 九月 2019 19:18:17 +0800 Subject: [PATCH] 金币版本拦截与频率拦截bug修改 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 129 ++++++++++++++++++++++++++++++------------ 1 files changed, 92 insertions(+), 37 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 0ad7a3d..9cbbb53 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,11 @@ import java.util.List; import java.util.Map; +import com.yeshi.fanli.dto.order.CommonOrderAddResultDTO; +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; @@ -44,7 +48,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; /** @@ -60,7 +64,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; /** * 绉诲姩娈佃鍗曞垪琛� @@ -73,8 +77,9 @@ * 鍒拌处鐘舵�� * @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; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -82,7 +87,7 @@ * @param uid * @return */ - public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day); + public Map<String, BigDecimal> countHistoryOrder(Long uid, Integer day, Integer source); /** * 缁熻璁㈠崟 @@ -90,7 +95,8 @@ * @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); /** * 缁熻璁㈠崟 @@ -98,7 +104,8 @@ * @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); /** * 缁熻濂栭噾璁㈠崟鏁伴噺銆侀噾棰� @@ -111,7 +118,7 @@ * @return */ public Map<String, Object> countBonusOrderMoneyAndNumber(Long uid, Integer type, Integer day, String startTime, - String endTime); + String endTime, Integer source); /** * 鏍规嵁鏉′欢缁熻 @@ -122,8 +129,8 @@ * @param endTime * @return */ - public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day); + public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, + Integer day, Integer source, Integer state, Integer stateOrder); /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 @@ -135,13 +142,34 @@ 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; + public List<CommonOrderAddResultDTO> addTaoBaoOrder(List<TaoBaoOrder> taoBaoOrder, Long uid) throws CommonOrderException; + + /** + * 缂撳瓨鎷煎澶氱被鏅�氳鍗� + * + * @param pddOrderList + * @param uid + * @return + * @throws CommonOrderException + */ + public List<CommonOrderAddResultDTO> addPDDOrder(List<PDDOrder> pddOrderList, Long uid) throws CommonOrderException; + + /** + * 缂撳瓨浜笢鏅�氳鍗� + * + * @param jdOrderList + * @param uid + * @return + * @throws CommonOrderException + */ + public List<CommonOrderAddResultDTO> addJDOrder(JDOrder jdOrder, Long uid) throws CommonOrderException; /** * 鏍规嵁鐢ㄦ埛ID锛岃鍗曠姸鎬侊紝缁撶畻鏃堕棿缁熻璁㈠崟鏁伴噺 @@ -195,31 +223,11 @@ */ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, - Integer type, Integer orderState, String startTime, String endTime) throws CommonOrderException; + 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) 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; + String startTime, String endTime, Integer source) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 @@ -229,7 +237,7 @@ * @return * @throws CommonOrderException */ - public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState) + public CommonOrderVO getCommonOrderByOrderNo(Long uid, String orderNo, Integer orderState, Integer sourceType) throws CommonOrderException; /** @@ -238,7 +246,7 @@ * @param orderNo * @return */ - public JSONObject getRewardJumpInfo(String orderNo); + public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType); /** * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� @@ -249,4 +257,51 @@ */ 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 + */ + public List<CommonOrder> listBySourceTypeAndStateAndThirdCrateTime(int sourceType, Integer state, Long minTime, + Long maxTime, int page, int pageSize); + + /** + * 鏌ヨ璁㈠崟 -鏍规嵁璁㈠崟鍙� + * + * @param uid + * @param orderNO + * @return + */ + public List<CommonOrder> getByOrderNo(Long uid, String orderNO); + + /** + * 鏍规嵁鐢ㄦ埛ID鏌ヨ鏈�杩戜竴鏉℃湁鏁堢殑璁㈠崟 + * + * @param uid + * @return + */ + public CommonOrder selectLatestValidByUid(Long uid); + } -- Gitblit v1.8.0