root
/
ifish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

This commit is contained in:
yiyan 2019-12-27 18:32:56 +08:00
parent adc9a4f1c1
commit f979a8f275
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/ifish/serviceImpl/UserServiceImpl.java
View File

@ -571,13 +571,12 @@ public class UserServiceImpl implements UserService {
} else { } else {
userDao.update(userWechat); userDao.update(userWechat);
} }
if (userPhone != null) { if (null != userPhone) {
//用户资产信息 UserAsset userAssetPhone = userAssetDao.get(userPhone.getUserId());
UserAssetDto userAssetDtoWechat = getUserAssetInfo(userWechat.getUserId()); UserAsset userAssetWechat = userAssetDao.get(userWechat.getUserId());
UserAssetDto userAssetDtoPhone = getUserAssetInfo(userPhone.getUserId()); userAssetPhone.setGoldValue(userAssetPhone.getGoldValue().add(userAssetWechat.getGoldValue()));
UserAsset userAsset = new UserAsset(userPhone.getUserId(),new BigDecimal(userAssetDtoWechat.getGoldValue().intValue() + userAssetDtoPhone.getGoldValue().intValue())); userAssetDao.update(userAssetPhone);
userAssetDao.update(userAsset); userAssetDao.delete(userAssetWechat);
} }
return new JsonResult<JSONObject>(ResultEnum.success.getKey()); return new JsonResult<JSONObject>(ResultEnum.success.getKey());
} }