From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java
index 1ff0186..e622a7c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java
@@ -4,9 +4,9 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.transaction.Transactional;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.user.UserExtraTaoBaoInfoMapper;
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;
@@ -29,7 +29,7 @@
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
+
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
@@ -55,6 +55,8 @@
taoBaoInfo.setRelationValid(valid);
taoBaoInfo.setRelationUpdateTime(new Date());
+ userExtraTaoBaoInfoMapper.clearUid(uid);
+
List<UserExtraTaoBaoInfo> list = userExtraTaoBaoInfoMapper.listByTaoBaoUid(taoBaoUid);
if (list == null || list.size() == 0) {
// 鏂板
@@ -66,12 +68,12 @@
taoBaoInfo.setUpdateTime(new Date());
userExtraTaoBaoInfoMapper.updateByPrimaryKeySelective(taoBaoInfo);
- // 娓呯┖澶氫綑宸茬粦瀹氭暟鎹�
- if (list.size() > 1) {
- for (int i = 1; i < list.size(); i++) {
- clearTaoBaoInfo(list.get(i));
- }
- }
+ // // 娓呯┖澶氫綑宸茬粦瀹氭暟鎹�
+ // if (list.size() > 1) {
+ // for (int i = 1; i < list.size(); i++) {
+ // clearTaoBaoInfo(list.get(i));
+ // }
+ // }
}
}
@@ -96,6 +98,8 @@
taoBaoInfo.setSpecialValid(valid);
taoBaoInfo.setSpecialId(specialId);
taoBaoInfo.setSpecialUpdateTime(new Date());
+
+ userExtraTaoBaoInfoMapper.clearUid(uid);
List<UserExtraTaoBaoInfo> list = userExtraTaoBaoInfoMapper.listByTaoBaoUid(taoBaoUid);
if (list == null || list.size() == 0) {
@@ -150,6 +154,9 @@
// 鍒ゆ柇涔嬪墠鐢ㄦ埛鏄惁缁戝畾杩�
UserExtraTaoBaoInfo info = userExtraTaoBaoInfoMapper.selectByUid(uid);
+ // 娓呴櫎涔嬪墠鐨勭敤鎴稩D
+ userExtraTaoBaoInfoMapper.clearUid(uid);
+
if (list == null || list.size() == 0) {
// 鏂板
taoBaoInfo.setCreateTime(new Date());
@@ -175,7 +182,7 @@
history.setUid(uid);
// 涔嬪墠宸茬粡缁戝畾鐢佃瘽鍙风爜
- if (info!=null)
+ if (info != null)
history.setFirst(false);
else
history.setFirst(true);
@@ -265,4 +272,14 @@
return userExtraTaoBaoInfoMapper.selectBySpecialIdWithUidNotNull(specialId);
}
+ @Override
+ public String getRelationIdByUid(Long uid) {
+ UserExtraTaoBaoInfo extraInfo = getByUid(uid);
+ String relationId = null;
+ if (extraInfo != null && extraInfo.getRelationId() != null && extraInfo.getRelationValid() != null
+ && extraInfo.getRelationValid() == true)
+ relationId = extraInfo.getRelationId();
+ return relationId;
+ }
+
}
--
Gitblit v1.8.0