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/tlj/UserTaoLiJinRecordService.java | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java index 465771b..af9be43 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/inter/tlj/UserTaoLiJinRecordService.java @@ -21,7 +21,7 @@ * @throws UserTaoLiJinRecordException */ public UserTaoLiJinRecord createUserTaoLiJin(int origin, Long uid, Long auctionId, BigDecimal perface, int totalNum, String name, Date sendStartTime, - Date sendEndTime, Date useStartTime, Date useEndTime) throws UserTaoLiJinRecordException; + Date sendEndTime, Date useStartTime, Date useEndTime,String pid) throws UserTaoLiJinRecordException; /** @@ -34,6 +34,13 @@ */ public List<UserTaoLiJinRecordVO> getRecordByUid(long start, int count, Long uid); + /** + * 缁熻鍒涘缓璁板綍鏉℃暟 + * @param uid + * @return + */ + public long countShareRecordByUid(Long uid); + /** * 缁熻鍒涘缓娆℃暟 @@ -76,7 +83,7 @@ * @return * @throws UserTaoLiJinRecordException */ - public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods) + public UserTaoLiJinRecord createSelfBuyTaoLiJin(Long uid, BigDecimal couplePrice, TaoBaoGoodsBrief goods) throws UserTaoLiJinRecordException; /** @@ -89,4 +96,17 @@ */ public UserTaoLiJinRecord createShareTaoLiJin(Long uid, int totalNum, TaoBaoGoodsBrief goods) throws UserTaoLiJinRecordException; + + + /** + * 璧犻�佹帹骞跨孩鍖� + * @param uid + * @param amount + * @return + * @throws UserTaoLiJinRecordException + */ + public String giveTaolijin(Long uid, BigDecimal amount) throws UserTaoLiJinRecordException; + + } + -- Gitblit v1.8.0