From c338aa60df58bee9f4c25afedf94fe6930a119c1 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 29 七月 2020 19:01:56 +0800
Subject: [PATCH] SpringContext中的循环任务优化,添加业务监控

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java
index bf8e5e7..2f5f10c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java
@@ -4,6 +4,7 @@
 
 import javax.annotation.Resource;
 
+import com.yeshi.fanli.entity.SystemFunction;
 import com.yeshi.fanli.util.SystemInfoUtil;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -66,11 +67,13 @@
 			out.print(JsonUtil.loadFalseResult(1, "鏆備笉寮�鏀剧敵璇�"));
 			return;
 		}
-		
-		String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
-		if (StringUtil.isNullOrEmpty(inviteCode)) {
-			out.print(JsonUtil.loadFalseResult(3, "璇锋縺娲婚個璇风爜"));
-			return;
+
+		if(SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.threeSale)) {
+			String inviteCode = userInfoExtraService.getInviteCodeByUid(uid);
+			if (StringUtil.isNullOrEmpty(inviteCode)) {
+				out.print(JsonUtil.loadFalseResult(3, "璇锋縺娲婚個璇风爜"));
+				return;
+			}
 		}
 		
 		
@@ -90,8 +93,7 @@
 
 		boolean canParse = "0".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.autoFindTaobaoOrder.getKey(), SystemInfoUtil.getSystem(acceptData))) ? false : true;
 
-		String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
-				"http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);
+		String link = 	TaoBaoUtil.getTaoBaoAuthLink(uid, source);
 
 		String orderJS = configService.getValue(ConfigKeyEnum.taobaoOrderParseJS.getKey(),SystemInfoUtil.getSystem(acceptData));
 		if (!canParse)

--
Gitblit v1.8.0