From 14d45c1a99ad606cec73ec5e66be5ebd484cacd1 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 26 九月 2019 11:55:11 +0800 Subject: [PATCH] 金币 bug --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java | 32 +++++++++++++++++++++++++++++--- 1 files changed, 29 insertions(+), 3 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 c1f03ff..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 @@ -24,6 +24,7 @@ import com.yeshi.fanli.entity.bus.user.UserInfo; import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum; import com.yeshi.fanli.entity.bus.user.WeiXinUser; +import com.yeshi.fanli.entity.push.DeviceActive; import com.yeshi.fanli.entity.system.BusinessSystem; import com.yeshi.fanli.entity.taobao.ClientTBPid; import com.yeshi.fanli.entity.taobao.PidUser; @@ -43,7 +44,9 @@ import com.yeshi.fanli.service.inter.order.LostOrderService; import com.yeshi.fanli.service.inter.order.OrderService; import com.yeshi.fanli.service.inter.order.config.HongBaoManageService; +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.taobao.TaoBaoUnionConfigService; import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService; @@ -125,6 +128,9 @@ private DeviceTokenHWService deviceTokenHWService; @Resource + private DeviceTokenOPPOService deviceTokenOPPOService; + + @Resource private TaoBaoUnionConfigService taoBaoUnionConfigService; @Resource @@ -156,6 +162,9 @@ @Resource private UserInfoModifyRecordService userInfoModifyRecordService; + + @Resource + private DeviceActiveService deviceActiveService; private static final String PASSWORD_MAX_ERROR = "password_max_error"; private static final String EXTRACT_MIN_MONEY = "extract_min_money"; @@ -253,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(); } @@ -1128,9 +1142,15 @@ public void logOut(AcceptData acceptData, Long uid, PrintWriter out) { if (uid == null || uid == 0) return; - // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 - if ("android".equalsIgnoreCase(acceptData.getPlatform())) + if ("android".equalsIgnoreCase(acceptData.getPlatform())) { + DeviceActive deviceActive = deviceActiveService.getFirstActiveInfo(acceptData.getDevice()); + // 闇�瑕佽В缁慔W鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 deviceTokenHWService.unBindDeviceToken(acceptData.getDevice()); + if (deviceActive != null) { + // 瑙g粦OPPO鎺ㄩ�佺殑鐢ㄦ埛缁戝畾 + deviceTokenOPPOService.unBindUid(uid, deviceActive.getId()); + } + } out.print(JsonUtil.loadTrueResult("")); } @@ -1208,6 +1228,12 @@ } catch (Exception e) { e.printStackTrace(); } + } + + // 缁戝畾oppo鎺ㄩ�� + DeviceActive active = deviceActiveService.getFirstActiveInfo(acceptData.getDevice()); + if (active != null) { + deviceTokenOPPOService.bindUid(uuser.getId(), active.getId()); } } }); @@ -1322,7 +1348,7 @@ } try { - userAccountService.bindWeiXin(acceptData,uid, code); + userAccountService.bindWeiXin(acceptData, uid, code); UserInfo user = userInfoService.getUserByIdWithMybatis(uid); // 鍒ゆ柇taoBaoUid鏄惁宸茬粡灏佺 -- Gitblit v1.8.0