This commit is contained in:
parent
acc200a54e
commit
adc9a4f1c1
|
|
@ -571,8 +571,15 @@ public class UserServiceImpl implements UserService {
|
||||||
} else {
|
} else {
|
||||||
userDao.update(userWechat);
|
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<JSONObject>(ResultEnum.success.getKey());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateData(String sql){
|
public void updateData(String sql){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue