From 64a8f7a3be0a5584fe2164a2474b189c79cfab5c Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 28 十二月 2019 18:15:39 +0800 Subject: [PATCH] 小程序接口初步建立 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java index f1070e2..2db9ebc 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java @@ -86,7 +86,7 @@ return threeSaleMapper.selectBoss(uid); } - @Transactional + @Transactional(rollbackFor=Exception.class) public void bind(UserInfo worker, UserInfo inviter) throws ThreeSaleException { if (worker == null || inviter == null) throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖"); @@ -500,7 +500,7 @@ } @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public void bindRelationshipByInviteCode(UserInfo invitee, UserInfo inviter) throws ThreeSaleException { if (invitee == null || inviter == null) throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖"); @@ -520,7 +520,7 @@ } @Override - @Transactional + @Transactional(rollbackFor=Exception.class) public void bindRelationshipByWX(UserInfo invitee, Long inviterId)throws ThreeSaleException { if (invitee == null || inviterId == null) throw new ThreeSaleException(1, "鐢ㄦ埛淇℃伅涓虹┖"); @@ -550,7 +550,7 @@ private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) { // 閭�璇锋秷鎭� UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId); - if (activeLog != null && VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", + if (activeLog != null && VersionUtil.greaterThan_2_0_5("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android", activeLog.getVersionCode())) { // 2.1鐗堟湰浠ヤ笂 userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale); } else { // 鏈�鍒濇秷鎭� @@ -590,6 +590,11 @@ public ThreeSale selectByWorkerId(Long workerId) { return threeSaleMapper.selectSuccessByWorkerId(workerId); } + + @Override + public ThreeSale getNearRelationByBossIdAndWorkerId(Long bossId, Long workerId) { + return threeSaleMapper.getNearRelationByBossIdAndWorkerId(bossId, workerId); + } @Override public List<ThreeSale> getSuccessByDate(Long bossId, Long minTime, Long maxTime) { @@ -621,4 +626,9 @@ threeSaleMapper.inviteSeparate(workerId, bossId); } + @Override + public long getTeamOrderNumByWorkerId(Long workerId) { + return threeSaleMapper.getTeamOrderNumByWorkerId(workerId); + } + } -- Gitblit v1.8.0