Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java

@@ -14,6 +14,7 @@
import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TaoBaoConstant;

@@ -31,6 +32,9 @@
   @Resource

   private ConfigService configService;



   @Resource

   private UserInfoExtraService userInfoExtraService;

	
   /**

    * 获取淘宝授权信息

    * 

@@ -61,7 +65,14 @@
         out.print(JsonUtil.loadFalseResult(1, "暂不开放申请"));

         return;

      }



		
      String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);

      if (StringUtil.isNullOrEmpty(inviteCode)) {

         out.print(JsonUtil.loadFalseResult(3, "请激活邀请码"));

         return;

      }

		
		
      UserExtraTaoBaoInfo user = userExtraTaoBaoInfoService.getByUid(uid);

      if ("share".equalsIgnoreCase(source)) {

         if (user != null && !StringUtil.isNullOrEmpty(user.getRelationId()) && user.getRelationValid()) {