From d4588f4e43336b26b356b869c29d0c76390167d5 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 15 四月 2020 10:22:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
index 257cf2c..bf9338d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteValidNumServiceImpl.java
@@ -6,6 +6,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.UserInviteValidNumMapper;
import com.yeshi.fanli.dao.mybatis.user.UserInviteValidRecordMapper;
@@ -30,7 +31,6 @@
private ThreeSaleSerivce threeSaleSerivce;
-
@Override
public UserInviteValidNum selectByPrimaryKey(Long id) {
return userInviteValidNumMapper.selectByPrimaryKey(id);
@@ -41,12 +41,14 @@
* 鐩存帴绮変笣 +1
* @param uid
*/
+ @Transactional(rollbackFor = Exception.class)
private void addNumFirst(Long uid) {
UserInviteValidNum inviteValid = userInviteValidNumMapper.selectForUpdate(uid);
if (inviteValid != null) {
userInviteValidNumMapper.addNumFirst(uid, 1);
} else {
inviteValid = new UserInviteValidNum();
+ inviteValid.setId(uid);
inviteValid.setNumFirst(1);
inviteValid.setNumSecond(0);
inviteValid.setUpdateTime(new Date());
@@ -58,12 +60,14 @@
* 闂存帴绮変笣 +1
* @param uid
*/
+ @Transactional(rollbackFor = Exception.class)
private void addNumSecond(Long uid) {
UserInviteValidNum inviteValid = userInviteValidNumMapper.selectForUpdate(uid);
if (inviteValid != null) {
userInviteValidNumMapper.addNumSecond(uid, 1);
} else {
inviteValid = new UserInviteValidNum();
+ inviteValid.setId(uid);
inviteValid.setNumFirst(0);
inviteValid.setNumSecond(1);
inviteValid.setUpdateTime(new Date());
@@ -72,6 +76,7 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void addValidTeamNum(Long uid, BigDecimal payment, Date payDate) {
if (uid == null || payment == null || payDate == null) {
return;
@@ -122,13 +127,14 @@
return;
}
+ // 闂存帴鍏崇郴
Long bossIdSuper = threeSaleSuper.getBoss().getId();
- String uniqueKeySuper = StringUtil.Md5(bossIdSuper + "#" + bossId + "#" + UserInviteValidRecord.TYPE_TWO);
+ String uniqueKeySuper = StringUtil.Md5(bossIdSuper + "#" + uid + "#" + UserInviteValidRecord.TYPE_TWO);
UserInviteValidRecord recordSuper = userInviteValidRecordMapper.selectByUniqueKey(uniqueKeySuper);
if (recordSuper == null) {
recordSuper = new UserInviteValidRecord();
recordSuper.setUid(bossIdSuper);
- recordSuper.setWorkerId(bossId);
+ recordSuper.setWorkerId(uid);
recordSuper.setType(UserInviteValidRecord.TYPE_TWO);
recordSuper.setUniqueKey(uniqueKeySuper);
recordSuper.setCreateTime(new Date());
@@ -141,15 +147,5 @@
LogHelper.error(e);
}
}
-
-
-
-
-
-
-
-
-
-
}
--
Gitblit v1.8.0