yujian
2020-01-03 c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7
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;
@@ -63,10 +65,10 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisKeyEnum;
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 +131,12 @@
   @Resource
   private DeviceTokenOPPOService deviceTokenOPPOService;
   @Resource
   private DeviceTokenXMService deviceTokenXMService;
   @Resource
   private DeviceTokenVIVOService deviceTokenVIVOService;
   @Resource
   private TaoBaoUnionConfigService taoBaoUnionConfigService;
@@ -262,10 +270,12 @@
                     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());
                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());
                  }
               } catch (Exception e) {
                  e.printStackTrace();
@@ -787,8 +797,7 @@
         return;
      }
      String key = "bindalipay-" + uid;
      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
         out.print(JsonUtil.loadFalseResult(2, "服务器繁忙,请稍后重试"));
         return;
@@ -843,8 +852,7 @@
         return;
      }
      String key = "bindalipay-" + uid;
      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
         out.print(JsonUtil.loadFalseResult(1001, "服务器繁忙,请稍后重试"));
         return;
@@ -934,8 +942,7 @@
         return;
      }
      String key = "bindalipay-" + uid;
      String key = RedisKeyEnum.getRedisKey(RedisKeyEnum.bindAlipay, uid + "");
      if (!StringUtil.isNullOrEmpty(redisManager.getCommonString(key))) {
         out.print(JsonUtil.loadFalseResult(1001, "服务器繁忙,请稍后重试"));
         return;
@@ -1149,6 +1156,10 @@
         if (deviceActive != null) {
            // 解绑OPPO推送的用户绑定
            deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
            // 解绑VIVO推送的用户绑定
            deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
            // 解绑XM推送的用户绑定
            deviceTokenXMService.unBindUid(deviceActive.getId());
         }
      }
      out.print(JsonUtil.loadTrueResult(""));
@@ -1221,19 +1232,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());
                  }
               }
            });