From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 20 五月 2020 17:25:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2 --- fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java index 4883178..1a08e84 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/order/HongBaoOrderService.java @@ -2,7 +2,10 @@ import java.util.List; +import org.apache.ibatis.annotations.Param; + import com.yeshi.fanli.entity.order.HongBaoOrder; +import com.yeshi.fanli.vo.order.HongBaoCountVO; public interface HongBaoOrderService { @@ -46,12 +49,57 @@ * @return */ public long countByOrderNoAndHongBaoType(String orderNo, int hongBaotype, int sourceType); - + /** * 鑾峰彇璇︽儏 + * * @param commonOrderId * @return */ public HongBaoOrder selectDetailByCommonOrderId(Long commonOrderId); + /** + * 鑾峰彇璇︽儏 + * + * @param hongBaoId + * @return + */ + public HongBaoOrder selectDetailByHongBaoId(Long hongBaoId); + + /** + * 鏍规嵁璁㈠崟鍙峰拰鏉ユ簮绫诲瀷鏌ヨ + * + * @param orderId + * @param sourceType + * @return + */ + public List<HongBaoOrder> listByOrderIdAndSourceType(@Param("orderId") String orderId, + @Param("sourceType") int sourceType); + + /** + * 鏍规嵁璁㈠崟鍙峰拰鏉ユ簮绫诲瀷鏌ヨ璇︽儏 + * + * @param orderId + * @param sourceType + * @return + */ + public List<HongBaoOrder> listDetailByOrderIdAndSourceType(@Param("orderId") String orderId, + @Param("sourceType") int sourceType); + + /** + * 绾㈠寘淇℃伅缁熻 + * @param list + * @return + */ + public HongBaoCountVO getHongBaoCountVO(List<HongBaoOrder> list); + + /** + * 鏌ヨ璁㈠崟鐩稿叧绾㈠寘 + * @param orderId + * @param sourceType + * @param uid + * @return + */ + public List<HongBaoOrder> listDetailByOrderIdAndSourceTypeAndUid(String orderId, int sourceType, Long uid); + } -- Gitblit v1.8.0