fanli-server.git

			@@ -47,6 +47,7 @@
			import com.yeshi.fanli.service.inter.push.DeviceActiveService;
			import com.yeshi.fanli.service.inter.push.DeviceTokenHWService;
			import com.yeshi.fanli.service.inter.push.DeviceTokenOPPOService;
			import com.yeshi.fanli.service.inter.push.DeviceTokenVIVOService;
			import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
			import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
			import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;
			@@ -129,6 +130,9 @@

			@Resource
			private DeviceTokenOPPOService deviceTokenOPPOService;

			@Resource
			private DeviceTokenVIVOService deviceTokenVIVOService;

			@Resource
			private TaoBaoUnionConfigService taoBaoUnionConfigService;
			@@ -262,10 +266,11 @@
			platformType = 2;
			}
			userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice());
			// 绑定oppo推送
			// 绑定oppo,vivo推送
			DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
			if (active != null) {
			deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
			deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
			}
			} catch (Exception e) {
			e.printStackTrace();
			@@ -1149,6 +1154,8 @@
			if (deviceActive != null) {
			// 解绑OPPO推送的用户绑定
			deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
			// 解绑VIVO推送的用户绑定
			deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
			}
			}
			out.print(JsonUtil.loadTrueResult(""));
			@@ -1234,6 +1241,7 @@
			DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice());
			if (active != null) {
			deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
			deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
			}
			}
			});