From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期四, 12 十二月 2019 14:18:11 +0800 Subject: [PATCH] 订单补贴消息修改 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 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..5a3db7e 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 @@ -47,6 +47,8 @@ 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.push.DeviceTokenXMService; import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService; @@ -66,7 +68,6 @@ 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.wx.WXLoginUtil; @@ -129,6 +130,12 @@ @Resource private DeviceTokenOPPOService deviceTokenOPPOService; + + @Resource + private DeviceTokenXMService deviceTokenXMService; + + @Resource + private DeviceTokenVIVOService deviceTokenVIVOService; @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @@ -262,6 +269,13 @@ platformType = 2; } userSystemCouponService.copyLotteryPrize(uuser.getId(), platformType, acceptData.getDevice()); + // 缁戝畾oppo,vivo鎺ㄩ�� + DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice()); + if (active != null) { + deviceTokenOPPOService.bindUid(uuser.getId(), active.getId()); + deviceTokenVIVOService.bindUid(uuser.getId(), active.getId()); + deviceTokenXMService.bindUid(active.getId(), uuser.getId()); + } } catch (Exception e) { e.printStackTrace(); } @@ -1144,6 +1158,10 @@ if (deviceActive != null) { // 瑙g粦OPPO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 deviceTokenOPPOService.unBindUid(uid, deviceActive.getId()); + // 瑙g粦VIVO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 + deviceTokenVIVOService.unBindUid(uid, deviceActive.getId()); + // 瑙g粦XM鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 + deviceTokenXMService.unBindUid(deviceActive.getId()); } } out.print(JsonUtil.loadTrueResult("")); @@ -1216,13 +1234,12 @@ e.printStackTrace(); } - if (VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) { - /* 鏂颁汉绾㈠寘 */ - try { - userTaoLiJinOriginService.synchDeviceHongbao(uuser.getId(), device); - } catch (Exception e) { - e.printStackTrace(); - } + // 缁戝畾oppo鎺ㄩ�� + DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice()); + if (active != null) { + deviceTokenOPPOService.bindUid(uuser.getId(), active.getId()); + deviceTokenVIVOService.bindUid(uuser.getId(), active.getId()); + deviceTokenXMService.bindUid(active.getId(), uuser.getId()); } } }); -- Gitblit v1.8.0