From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/service/imp/UserService.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/UserService.java b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
index 75b446e..d5bfb19 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/UserService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/UserService.java
@@ -9,9 +9,10 @@
import com.yeshi.buwan.dao.user.LoginUserExtraDao;
import com.yeshi.buwan.domain.user.LoginUserExtra;
import com.yeshi.buwan.dto.user.LoginInfoDto;
-import com.yeshi.buwan.dto.user.QQUserInfo;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
+import com.yeshi.buwan.service.inter.LoginUserService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
@@ -22,12 +23,11 @@
import com.yeshi.buwan.dao.user.LoginUserDao;
import com.yeshi.buwan.dao.UserDao;
import com.yeshi.buwan.domain.user.LoginUser;
-import com.yeshi.buwan.domain.SystemInfo;
+import com.yeshi.buwan.domain.system.SystemInfo;
import com.yeshi.buwan.domain.UserData;
import com.yeshi.buwan.domain.UserInfo;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.util.StringUtil;
-import org.yeshi.utils.entity.wx.WeiXinUser;
@Service
public class UserService {
@@ -45,11 +45,25 @@
@Resource
private LoginUserExtraDao loginUserExtraDao;
+ @Resource
+ private LoginUserService loginUserService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
+
// 鐢ㄦ埛鎿嶄綔
public List<UserInfo> getUserList(int system, int page) {
return userDao.list("from UserInfo u where u.system.id=? order by u.createtime desc",
(page - 1) * Constant.pageCount, Constant.pageCount, new String[]{system + ""});
+ }
+
+ //璁剧疆鏄电О
+ public void setNickName(Long uid, String nickName) {
+ LoginUser update = new LoginUser();
+ update.setId(uid + "");
+ update.setName(nickName);
+ loginUserDao.updateSelective(update);
}
// 鑾峰彇鐢ㄦ埛鏁伴噺
@@ -83,7 +97,7 @@
}
public void updateLoginUserInfo(LoginUser lu) {
- loginUserDao.update(lu);
+ loginUserDao.updateSelective(lu);
}
public String getUid(String device, String system, String imei, String mac, String lat, String lng) {
@@ -241,10 +255,11 @@
if (loginUser != null) {
loginUser.setLoginType(dto.getLoginType());
- loginUserDao.update(loginUser);
+ loginUserDao.updateSelective(loginUser);
}
if (loginUserExtra != null) {
+ loginUserExtra.setUtdId(dto.getUtdId());
loginUserExtraDao.updateSelective(loginUserExtra);
}
@@ -257,7 +272,7 @@
*
* @param dto
*/
- public void register(LoginInfoDto dto) throws RegisterUserException {
+ public LoginUser register(LoginInfoDto dto) throws RegisterUserException {
LoginUser loginUser = null;
LoginUserExtra loginUserExtra = null;
switch (dto.getLoginType()) {
@@ -295,6 +310,7 @@
loginUser.setLoginType(LoginUser.LOGIN_TYPE_QQ);
loginUser.setQqOpenId(dto.getQqUserInfo().getOpenId());
loginUser.setName(dto.getQqUserInfo().getName());
+ loginUser.setPortrait(dto.getQqUserInfo().getPortrait());
loginUserExtra = new LoginUserExtra();
@@ -316,6 +332,7 @@
loginUser.setWxUnionId(dto.getWeiXinUser().getUnionid());
loginUser.setName(dto.getWeiXinUser().getNickname());
loginUser.setWxOpenId(dto.getWeiXinUser().getOpenid());
+ loginUser.setPortrait(dto.getWeiXinUser().getHeadimgurl());
loginUserExtra = new LoginUserExtra();
@@ -339,7 +356,7 @@
loginUser = new LoginUser();
loginUser.setLoginType(LoginUser.LOGIN_TYPE_PHONE);
- loginUser.setName(null);
+ loginUser.setName(dto.getNickName());
loginUser.setPhone(dto.getPhone());
loginUserExtra = new LoginUserExtra();
@@ -361,8 +378,10 @@
loginUser.setId(uid + "");
if (StringUtil.isNullOrEmpty(loginUser.getName())) {
+ //TODO 鏄电О鍓嶇紑
+// systemConfigService.getConfigValueByKeyCache("");
//璁剧疆榛樿鐢ㄦ埛鏄电О
- String nickName = "鏃犲悕姘�";
+ String nickName = "ID_" + uid;
LoginUser update = new LoginUser();
update.setId(uid + "");
update.setName(nickName);
@@ -371,7 +390,9 @@
loginUserExtra.setId(loginUser.getId());
loginUserExtra.setCreateTime(new Date());
- loginUserExtraDao.save(loginUserExtra);
+ loginUserService.initExtra(loginUserExtra);
+
+ return loginUser;
}
public LoginUser getLoginUser(String id) {
@@ -382,6 +403,15 @@
List<LoginUser> list = loginUserDao.list("from LoginUser lu where lu.openid=?", new Serializable[]{openid});
if (list != null && list.size() > 0)
return list.get(0);
+ return null;
+ }
+
+
+ public LoginUser getValidLoginUserByEmail(String email, String systemId) {
+ List<LoginUser> userList = loginUserDao.list("from LoginUser lu where lu.systemId=? and lu.email=? and lu.state=?", systemId, email, LoginUser.STATE_NORMAL);
+ if(userList!=null&&userList.size()>0){
+ return userList.get(0);
+ }
return null;
}
@@ -400,7 +430,7 @@
throw new Exception("璐︽埛宸茶娉ㄩ攢");
}
user.setState(LoginUser.STATE_UNREGISTER);
- loginUserDao.update(user);
+ loginUserDao.updateSelective(user);
}
// 閭娉ㄥ唽
--
Gitblit v1.8.0