From 2a3e411612bf75b81a8789127a714b5c5e28bc43 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 31 十月 2019 13:55:03 +0800 Subject: [PATCH] 红包获得 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 32 ++++++++++++++++++++++++++++---- 1 files changed, 28 insertions(+), 4 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 475bb4f..1c0927c 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 @@ -79,7 +79,7 @@ */ 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; + throws CommonOrderException,Exception; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -129,8 +129,8 @@ * @param endTime * @return */ - public Map<String, BigDecimal> countByUidAndOrderState(Long uid, Integer type, String startTime, String endTime, - Integer day, Integer source); + public Long countUserOrderToApp(Long uid, Integer type, String startTime, String endTime, + Integer day, Integer source, Integer state, Integer stateOrder); /** * 鏍规嵁璁㈠崟鍙蜂笌璁㈠崟绫诲瀷鏌ヨ璁㈠崟 @@ -246,7 +246,7 @@ * @param orderNo * @return */ - public JSONObject getRewardJumpInfo(String orderNo); + public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType); /** * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� @@ -303,5 +303,29 @@ * @return */ public CommonOrder selectLatestValidByUid(Long uid); + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @return + */ + public CommonOrderVO firstValidOrderByUid(Long uid); + + + /** + * 鏌ヨ棣栫瑪鏈夋晥璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type); + + /** + * 鏌ヨ鏄惁鏈湀鍒拌处璁㈠崟 + * @param uid + * @param type 绫诲瀷锛� 1鑷喘 2鍒嗕韩 3閭�璇� + * @return + */ + public CommonOrderVO firstValidOrderTheMonthByUidAndType(Long uid, Integer type); } -- Gitblit v1.8.0