From 534a87e48dfbaff65605995ec2a29211e0a8f45a Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期五, 15 十一月 2019 16:06:51 +0800 Subject: [PATCH] 红包功能改为2.1版本后再放开 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/CommonOrderService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 45 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 9f8b373..0d048a8 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; /** * 缁熻璁㈠崟-鏍规嵁绾㈠寘绫诲瀷 鑷喘 閭�璇� 鍒嗕韩 @@ -223,11 +223,13 @@ */ public List<CommonOrderVO> listQuery(long start, int count, Integer keyType, String key, Integer state, - Integer type, Integer orderState, String startTime, String endTime, Integer source) + Integer type, Integer orderState, String startTime, String endTime, Integer source, + List<Long> listShopId, List<Long> listGoodsId, Date minTime, BigDecimal money) throws CommonOrderException; public long countQuery(Integer keyType, String key, Integer state, Integer type, Integer orderState, - String startTime, String endTime, Integer source) throws CommonOrderException; + String startTime, String endTime, Integer source, + List<Long> listShopId, List<Long> listGoodsId,Date minTime, BigDecimal money) throws CommonOrderException; /** * 鏌ヨ璁㈠崟 @@ -246,7 +248,7 @@ * @param orderNo * @return */ - public JSONObject getRewardJumpInfo(String orderNo); + public JSONObject getRewardJumpInfo(String orderNo, Integer goodsType); /** * 鏍规嵁浜ゆ槗鍙疯幏鍙栬鍗曡鎯� @@ -303,5 +305,44 @@ * @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 firstValidOrderLastMonthByUidAndType(Long uid, Integer type); + + /** + * 棣栦釜鍒嗕韩璁㈠崟 + * @param uid + * @return + */ + public CommonOrder getFirstShareOrderByUid(Long uid); + + /** + * 璁㈠崟涓幏寰楁湁鏁堝閲� + * @param orderNo + * @param sourceType + * @return + */ + public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType); } -- Gitblit v1.8.0