From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001 From: yujian <yujian> Date: 星期一, 08 四月 2019 15:15:09 +0800 Subject: [PATCH] 冲突解决 --- fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java index 14d1edc..7016bc0 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/ThreeSaleSerivce.java @@ -23,6 +23,7 @@ /** * 閭�璇峰叧绯荤敓鏁� + * * @param worker */ void effective(UserInfo worker); @@ -202,10 +203,10 @@ * @return */ public List<ThreeSale> listByWorkerId(Long workerId); - - + /** * 鑾峰彇鎴愬姛閭�璇峰叧绯绘暟閲� + * * @param uid * @return */ @@ -213,6 +214,7 @@ /** * 閭�璇风爜鐢熸垚涓婁笅绾у叧绯� + * * @param invitee * @param inviter * @throws ThreeSaleException @@ -221,6 +223,7 @@ /** * 缁熻閭�璇锋垚鍔熼槦鍛樻暟閲� + * * @param uid * @return */ @@ -242,4 +245,12 @@ * @throws ThreeSaleException */ public void bindRelationshipByWX(UserInfo invitee, Long inviterId, ThreeSale threeSaleOld) throws ThreeSaleException; + + /** + * 鏍规嵁涓嬬骇鏌ユ壘瀵硅薄 + * @param workerId + * @return + */ + public ThreeSale selectByWorkerId(Long workerId); + } -- Gitblit v1.8.0