Skip to content

GitLab

Q
qk_backend
Commit 8b146574 authored by shiyu's avatar shiyu
Browse files
Options

登陆完成后返回用户信息

parent 1419c7e5
Show whitespace changes
Inline Side-by-side
Showing with 82 additions and 35 deletions
ch-dao/src/main/java/com/wwdz/ch/db/dao/distribution/CollectionBookDao.java
View file @ 8b146574
......@@ -13,7 +13,7 @@ public interface CollectionBookDao {
* @param collectionBook
* @return
*/
int insert(CollectionBook collectionBook);
long insert(CollectionBook collectionBook);
/**
* 更新记录
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/UserDaoImpl.java
View file @ 8b146574
......@@ -31,8 +31,8 @@ public class UserDaoImpl implements UserDao {
UserExample example = new UserExample();
UserExample.Criteria criteria = example.createCriteria();
criteria.andIdEqualTo(user.getId());
List<User> userList = userMapper.selectByExample(example);
if (CollectionUtils.isEmpty(userList)) {
long count = userMapper.countByExample(example);
if (count == 0) {
return userMapper.insertBySelfId(user);
}
return 0;
......@@ -41,9 +41,6 @@ public class UserDaoImpl implements UserDao {
@Override
public User queryByOid(String openId) {
CloudServerResponse<com.wwdz.user.api.model.user.User> cloudServerResponse = userReadService.getUserByOpenIdOrUnionId(null, openId);
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/CollectionBookDaoImpl.java
View file @ 8b146574
......@@ -20,8 +20,9 @@ public class CollectionBookDaoImpl implements CollectionBookDao {
@Override
public int insert(CollectionBook collectionBook) {
return collectionBookMapper.insert(collectionBook);
public long insert(CollectionBook collectionBook) {
collectionBookMapper.insert(collectionBook);
return collectionBook.getId();
}
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java
View file @ 8b146574
......@@ -3,10 +3,7 @@ package com.wwdz.ch.wx.impl;
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
import com.alibaba.dubbo.config.annotation.Reference;
import com.alibaba.fastjson.JSONObject;
import com.wwdz.ch.core.consts.ConsignSaleEnum;
import com.wwdz.ch.core.consts.IMEnum;
import com.wwdz.ch.core.consts.ResultCode;
import com.wwdz.ch.core.consts.ReturnOrderEnum;
import com.wwdz.ch.core.consts.*;
import com.wwdz.ch.core.entity.im.SendChatMsgRequestDto;
import com.wwdz.ch.core.im.api.ChatUserApi;
import com.wwdz.ch.core.im.api.ConversationApi;
......@@ -15,14 +12,12 @@ import com.wwdz.ch.core.notify.NotifyService;
import com.wwdz.ch.core.notify.SmsResult;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.type.UserTypeEnum;
import com.wwdz.ch.core.util.CacheUtil;
import com.wwdz.ch.core.util.CharUtil;
import com.wwdz.ch.core.util.RegexUtil;
import com.wwdz.ch.core.util.UUID;
import com.wwdz.ch.core.util.bcrypt.BCryptPasswordEncoder;
import com.wwdz.ch.db.dao.AiAssistantDao;
import com.wwdz.ch.db.dao.ConsignSaleDao;
import com.wwdz.ch.db.dao.ReturnOrderDao;
import com.wwdz.ch.db.dao.UserDao;
import com.wwdz.ch.db.dao.*;
import com.wwdz.ch.db.dao.distribution.ShopWhiteListDao;
import com.wwdz.ch.db.domain.AiAssistant;
import com.wwdz.ch.db.domain.Switch;
......@@ -149,6 +144,12 @@ public class UserServiceImpl implements UserService {
@Autowired
ShopWhiteListDao shopWhiteListDao;
@Autowired
CacheUtil cacheUtil;
@Autowired
FollowFansRecordDao followFansRecordDao;
@Override
public Result finishLogin(UserRequestDto dto) {
......@@ -224,6 +225,15 @@ public class UserServiceImpl implements UserService {
// 缓存用户信息
String userKey = MessageFormat.format(CacheCodeConstants.USER_INFO_KEY, user.getId());
redisUtil.set(userKey, user, 2 * 60 * 60);
//返回用户信息
user = cacheUtil.getAppletUserById(dto.getUserId());
result.put("avatar", com.xxdxxs.utils.StringUtils.isEmpty(user.getAvatar()) ? CommConsts.DEFAULT_AVATAR_URL : user.getAvatar());
result.put("name", com.xxdxxs.utils.StringUtils.isEmpty(user.getNickname()) ? "微信用户" : user.getNickname());
result.put("background", com.xxdxxs.utils.StringUtils.isEmpty(user.getBackground()) ? CommConsts.DEFAULT_BACKGROUND_URL : user.getBackground());
result.put("profile", user.getProfile());
long fansNum = followFansRecordDao.countFans(dto.getUserId());
result.put("fansNum", fansNum);
logger.info("【请求结束】登录信息初始化成功, 响应结果:{}", JSONObject.toJSONString(result));
return Result.success(result);
}
......@@ -376,7 +386,6 @@ public class UserServiceImpl implements UserService {
}
}*/
@Transactional(rollbackFor = Exception.class)
@Override
public Result updateProfile(UserRequestDto dto) {
try {
......@@ -394,12 +403,10 @@ public class UserServiceImpl implements UserService {
return Result.success();
} catch (Exception e) {
logger.error("用户修改个性签名失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("修改个性签名失败");
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public Result updateBackground(UserRequestDto dto) {
try {
......@@ -417,7 +424,6 @@ public class UserServiceImpl implements UserService {
return Result.success();
} catch (Exception e) {
logger.error("用户修改背景失败", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return Result.failed("修改背景失败");
}
}
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/CollectionBookServiceImpl.java
View file @ 8b146574
......@@ -3,6 +3,7 @@ package com.wwdz.ch.wx.impl.distribution;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dao.CollectionBookSortDao;
import com.wwdz.ch.db.dao.CollectorWhiteListDao;
import com.wwdz.ch.db.dao.distribution.CollectionBookDao;
import com.wwdz.ch.db.dao.distribution.CollectionItemsRelationDao;
import com.wwdz.ch.db.dao.distribution.CollectionShareRecordDao;
......@@ -11,6 +12,7 @@ import com.wwdz.ch.db.domain.distribution.CollectionBook;
import com.wwdz.ch.db.domain.distribution.CollectionShareRecord;
import com.wwdz.ch.db.dto.request.distribution.CollectionBookRequestDto;
import com.wwdz.ch.db.dto.request.distribution.CollectionItemsRelationRequestDto;
import com.wwdz.ch.wx.constant.CollectionBookConstants;
import com.wwdz.ch.wx.service.distribution.CollectionBookService;
import com.xxdxxs.utils.EntityMapper;
import com.xxdxxs.utils.StringUtils;
......@@ -38,6 +40,9 @@ public class CollectionBookServiceImpl implements CollectionBookService {
@Autowired
CollectionBookSortDao collectionBookSortDao;
@Autowired
CollectorWhiteListDao collectorWhiteListDao;
@Override
public Result create(CollectionBookRequestDto dto) {
try {
......@@ -55,7 +60,15 @@ public class CollectionBookServiceImpl implements CollectionBookService {
collectionBook.setCreateTime(new Date());
collectionBook.setUpdateTime(new Date());
collectionBook.setIsDeleted(false);
collectionBookDao.insert(collectionBook);
long bookId = collectionBookDao.insert(collectionBook);
//更新标签排序
CollectionBookSort collectionBookSort = collectionBookSortDao.find(dto.getUserId());
if (collectionBookSort != null) {
String sortInfo = collectionBookSort.getSortInfo();
sortInfo = sortInfo + "," + bookId;
collectionBookSortDao.update(dto.getUserId(), sortInfo);
}
return Result.success();
} catch (Exception e) {
logger.error("新建收藏册 error: {}", e);
......@@ -95,6 +108,26 @@ public class CollectionBookServiceImpl implements CollectionBookService {
userId = itemUserId;
}
}
//查询标签排序记录
CollectionBookSort collectionBookSort = collectionBookSortDao.find(userId);
//没有排序记录，则使用默认排序
if (collectionBookSort == null) {
//查询藏家白名单, 在白名单中说是藏家，需要加上默认标签
if (dto.getIsHasExtraLabel()) {
if (collectorWhiteListDao.isExisted(userId)) {
for (CollectionBookConstants.DefaultBookEnum defaultBookEnum: CollectionBookConstants.DefaultBookEnum.values()) {
Map<String, Object> map = new HashMap<>();
map.put("id", defaultBookEnum.getId());
map.put("title", defaultBookEnum.getName());
list.add(map);
}
}
Map<String, Object> map = new HashMap<>();
map.put("id", 0);
map.put("title", "我收藏的");
list.add(0, map);
}
List<CollectionBook> collectionBookList = collectionBookDao.findByUserId(userId);
collectionBookList.forEach(collectionBook -> {
Map<String, Object> map = new HashMap<>();
......@@ -102,12 +135,12 @@ public class CollectionBookServiceImpl implements CollectionBookService {
map.put("title", collectionBook.getTitle());
list.add(map);
});
if (dto.getIsHasExtraLabel()) {
Map<String, Object> map = new HashMap<>();
map.put("id", 0);
map.put("title", "我收藏的");
list.add(0, map);
} else {
//用户自定义排序
String sortInfo = collectionBookSort.getSortInfo();
}
return Result.success(list);
} catch (Exception e) {
logger.error("查询收藏册 error: {}", e);
......@@ -124,6 +157,16 @@ public class CollectionBookServiceImpl implements CollectionBookService {
CollectionItemsRelationRequestDto collectionItemsRelationRequestDto = new CollectionItemsRelationRequestDto();
collectionItemsRelationRequestDto.setCollectionBookId(dto.getId());
collectionItemsRelationDao.delete(collectionItemsRelationRequestDto);
//更新标签排序
CollectionBookSort collectionBookSort = collectionBookSortDao.find(dto.getUserId());
if (collectionBookSort != null) {
String sortInfo = collectionBookSort.getSortInfo();
List<String> list = Arrays.asList(sortInfo.split(","));
list.remove("" + dto.getId());
sortInfo = String.join("," , list);
collectionBookSortDao.update(dto.getUserId(), sortInfo);
}
return Result.success();
} catch (Exception e) {
logger.error("删除收藏册 error: {}", e);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/WxUserController.java
View file @ 8b146574
......@@ -134,8 +134,8 @@ public class WxUserController {
if (StringUtils.isBlank(dto.getProfile())) {
dto.setProfile("");
} else {
if (dto.getProfile().length() > 30) {
return Result.failed("个人简介的字数应在30字以内");
if (dto.getProfile().length() > 100) {
return Result.failed("个人简介应在100字以内");
}
}
return userService.updateProfile(dto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment