yujian
2020-01-03 c9cbdfa41d645d42eeaa7e06d550d4ef8ac328e7
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAccountController.java
@@ -48,6 +48,7 @@
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;
@@ -64,6 +65,7 @@
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;
@@ -129,7 +131,10 @@
   @Resource
   private DeviceTokenOPPOService deviceTokenOPPOService;
   @Resource
   private DeviceTokenXMService deviceTokenXMService;
   @Resource
   private DeviceTokenVIVOService deviceTokenVIVOService;
@@ -270,6 +275,7 @@
                  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();
@@ -791,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;
@@ -847,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;
@@ -938,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;
@@ -1155,6 +1158,8 @@
            deviceTokenOPPOService.unBindUid(uid, deviceActive.getId());
            // 解绑VIVO推送的用户绑定
            deviceTokenVIVOService.unBindUid(uid, deviceActive.getId());
            // 解绑XM推送的用户绑定
            deviceTokenXMService.unBindUid(deviceActive.getId());
         }
      }
      out.print(JsonUtil.loadTrueResult(""));
@@ -1232,6 +1237,7 @@
                  if (active != null) {
                     deviceTokenOPPOService.bindUid(uuser.getId(), active.getId());
                     deviceTokenVIVOService.bindUid(uuser.getId(), active.getId());
                     deviceTokenXMService.bindUid(active.getId(), uuser.getId());
                  }
               }
            });