From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
index 8f8ee76..385a32e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -60,7 +60,9 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.ThreadUtil;
+import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
+import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
import com.yeshi.fanli.util.wx.WXLoginUtil;
import net.sf.json.JSONObject;
@@ -1180,15 +1182,14 @@
e.printStackTrace();
}
- /* 鏂颁汉绾㈠寘 */
- try {
- userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
-
+ if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
+ /* 鏂颁汉绾㈠寘 */
+ try {
+ userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
});
}
--
Gitblit v1.8.0