diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index ea946bd..e497e64 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -571,8 +571,15 @@ public class UserServiceImpl implements UserService { } else { userDao.update(userWechat); } + if (userPhone != null) { + //用户资产信息 + UserAssetDto userAssetDtoWechat = getUserAssetInfo(userWechat.getUserId()); + UserAssetDto userAssetDtoPhone = getUserAssetInfo(userPhone.getUserId()); + UserAsset userAsset = new UserAsset(userPhone.getUserId(),new BigDecimal(userAssetDtoWechat.getGoldValue().intValue() + userAssetDtoPhone.getGoldValue().intValue())); + userAssetDao.update(userAsset); - return wechatValidate(unionId); + } + return new JsonResult(ResultEnum.success.getKey()); } public void updateData(String sql){