From b6f6df531ab4fdaf2b800f67eb116323e07797e4 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 12 七月 2019 10:42:20 +0800
Subject: [PATCH] Merge branch 'master' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserExtraTaoBaoInfoServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 a2e0c23..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
@@ -29,7 +29,7 @@
@Resource
private ForbiddenUserIdentifyCodeService forbiddenUserIdentifyCodeService;
-
+
@Resource
private UserAccountBindingHistoryService userAccountBindingHistoryService;
@@ -54,7 +54,7 @@
taoBaoInfo.setRelationId(relationId);
taoBaoInfo.setRelationValid(valid);
taoBaoInfo.setRelationUpdateTime(new Date());
-
+
userExtraTaoBaoInfoMapper.clearUid(uid);
List<UserExtraTaoBaoInfo> list = userExtraTaoBaoInfoMapper.listByTaoBaoUid(taoBaoUid);
@@ -68,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));
+ // }
+ // }
}
}
@@ -98,7 +98,7 @@
taoBaoInfo.setSpecialValid(valid);
taoBaoInfo.setSpecialId(specialId);
taoBaoInfo.setSpecialUpdateTime(new Date());
-
+
userExtraTaoBaoInfoMapper.clearUid(uid);
List<UserExtraTaoBaoInfo> list = userExtraTaoBaoInfoMapper.listByTaoBaoUid(taoBaoUid);
@@ -153,8 +153,8 @@
// 鍒ゆ柇涔嬪墠鐢ㄦ埛鏄惁缁戝畾杩�
UserExtraTaoBaoInfo info = userExtraTaoBaoInfoMapper.selectByUid(uid);
-
- //娓呴櫎涔嬪墠鐨勭敤鎴稩D
+
+ // 娓呴櫎涔嬪墠鐨勭敤鎴稩D
userExtraTaoBaoInfoMapper.clearUid(uid);
if (list == null || list.size() == 0) {
@@ -182,7 +182,7 @@
history.setUid(uid);
// 涔嬪墠宸茬粡缁戝畾鐢佃瘽鍙风爜
- if (info!=null)
+ if (info != null)
history.setFirst(false);
else
history.setFirst(true);
@@ -272,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