From 011d53f9f3d08af8cd622585ce40eb880f313aaf Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 25 九月 2019 12:02:57 +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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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 4d571c5..924f3a6 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
@@ -262,6 +262,11 @@
 							platformType = 2;
 						}
 						userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
+						// 缁戝畾oppo鎺ㄩ��
+						DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+						if (active != null) {
+							deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+						}
 					} catch (Exception e) {
 						e.printStackTrace();
 					}
@@ -1224,6 +1229,12 @@
 								e.printStackTrace();
 							}
 						}
+						
+						// 缁戝畾oppo鎺ㄩ��
+						DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
+						if (active != null) {
+							deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
+						}
 					}
 				});
 			}

--
Gitblit v1.8.0