From adc9a4f1c157dad061e1171078885e7a7658d3b8 Mon Sep 17 00:00:00 2001
From: yiyan <thelongcode@163.com>
Date: Thu, 26 Dec 2019 10:22:35 +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

---
 src/main/java/com/ifish/serviceImpl/UserServiceImpl.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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<JSONObject>(ResultEnum.success.getKey());
 	}
 
 	public void updateData(String sql){