From f979a8f27541c09e470d6880b4e5d75c6cf72144 Mon Sep 17 00:00:00 2001 From: yiyan Date: Fri, 27 Dec 2019 18:32:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/serviceImpl/UserServiceImpl.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java index e497e64..2c44a75 100644 --- a/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/UserServiceImpl.java @@ -571,13 +571,12 @@ 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); - + if (null != userPhone) { + UserAsset userAssetPhone = userAssetDao.get(userPhone.getUserId()); + UserAsset userAssetWechat = userAssetDao.get(userWechat.getUserId()); + userAssetPhone.setGoldValue(userAssetPhone.getGoldValue().add(userAssetWechat.getGoldValue())); + userAssetDao.update(userAssetPhone); + userAssetDao.delete(userAssetWechat); } return new JsonResult(ResultEnum.success.getKey()); }