From cdcbed9af813b2a02cdc01eefa24db8bec6b51a9 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 三月 2019 12:17:33 +0800
Subject: [PATCH] 主分类 + 子分类 DAO改造
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
index c7d3b84..23a7e25 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserInfoServiceImpl.java
@@ -38,13 +38,14 @@
import com.yeshi.fanli.entity.bus.user.InviteUser;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.exception.ThreeSaleException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserRankService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
@@ -89,6 +90,10 @@
@Resource
private HongBaoV2CountService hongBaoV2CountService;
+
+ @Resource
+ private UserRankService userRankService;
+
public UserInfo getUserByLoginTypeAndOpenId(int loginType, String openid, String appid) {
List<UserInfo> list = null;
@@ -443,7 +448,7 @@
find.setLoginType(Constant.WEIXIN);
find.setRank(0);
find.setWxOpenId(weiXinUser.getOpenid());
- System system = new System(Constant.FANLI);
+ BusinessSystem system = new BusinessSystem(Constant.FANLI);
system.setPlatform(1);
find.setSystem(system);
}
@@ -644,7 +649,7 @@
if (userList == null || userList.size() == 0) {
return null;
}
-
+
for (UserInfoVO userInfoVO : userList) {
// 鏁版嵁鍔犲伐澶勭悊
convertUserInfoVOData(userInfoVO);
@@ -654,22 +659,29 @@
}
public void convertUserInfoVOData(UserInfoVO userInfoVO) {
- String f_alipayAccount = userInfoVO.getF_alipayAccount();
+
+ String rankName = userInfoVO.getRankName();
+ if (rankName == null || rankName.trim().length() == 0) {
+ userInfoVO.setRankName("闈掗摐");
+ userInfoVO.setRankPicture("http://img.flqapp.com/resource/rank/rank_picture_new_1.png");
+ }
+
+ String f_alipayAccount = userInfoVO.getAlipayAccountInvalid();
if (f_alipayAccount != null && f_alipayAccount.trim().length() > 0) {
userInfoVO.setAlipayAccountState(1);
}
- String f_phone = userInfoVO.getF_phone();
+ String f_phone = userInfoVO.getPhoneInvalid();
if (f_phone != null && f_phone.trim().length() > 0) {
userInfoVO.setPhoneState(1);
}
- String f_taobaoUid = userInfoVO.getF_taobaoUid();
+ String f_taobaoUid = userInfoVO.getTaobaoUidInvalid();
if (f_taobaoUid != null && f_taobaoUid.trim().length() > 0) {
userInfoVO.setTaobaoUidState(1);
}
- String f_wxUnionId = userInfoVO.getF_wxUnionId();
+ String f_wxUnionId = userInfoVO.getWxUnionIdInvalid();
if (f_wxUnionId != null && f_wxUnionId.trim().length() > 0) {
userInfoVO.setWxUnionIdState(1);
}
@@ -680,9 +692,18 @@
userInfoVO.setLastLoginTime(null);
}
+ /* 鏄剧ず鐢ㄦ埛寰俊 娣樺疂 鑰佺増鏈瓨鍦�
+ * String wxUnionId = userInfoVO.getWxUnionId(); if (wxUnionId == null ||
+ * wxUnionId.trim().length() == 0) { userInfoVO.setWxName(null); }
+ *
+ * String taoBaoUid = userInfoVO.getTaoBaoUid(); if (taoBaoUid == null ||
+ * taoBaoUid.trim().length() == 0) { userInfoVO.setTbName(null); }
+ */
+
Long uid = userInfoVO.getId();
+
/* 缁戝畾鏀舵璐﹀彿淇℃伅 */
List<BindingAccount> account = bindingAccountMapper.selectByUid(uid);
if (account != null && account.size() > 0) {
--
Gitblit v1.8.0