From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 c6390ee..b488ca7 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
@@ -12,7 +12,9 @@
import com.yeshi.fanli.entity.accept.AcceptData;
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;
@@ -30,6 +32,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
/**
* 鑾峰彇娣樺疂鎺堟潈淇℃伅
*
@@ -56,11 +61,18 @@
return;
}
- if (!"1".equalsIgnoreCase(configService.get("open_speical_and_relation_apply"))) {
+ if (!"1".equalsIgnoreCase(configService.get(ConfigKeyEnum.openSpeicalAndRelationApply.getKey()))) {
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()) {
@@ -75,12 +87,12 @@
}
}
- boolean canParse = "0".equalsIgnoreCase(configService.get("auto_find_taobao_order")) ? false : true;
+ boolean canParse = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.autoFindTaobaoOrder.getKey())) ? false : true;
String link = TaoBaoUtil.getTaoBaoUnionAuthUrl(TaoBaoConstant.TAOBAO_AUTH_APPKEY,
"http://api.flqapp.com/fanli/client/v1/auth/callback/tb", uid, source);
- String orderJS = configService.get("taobao_order_parse_js");
+ String orderJS = configService.get(ConfigKeyEnum.taobaoOrderParseJS.getKey());
if (!canParse)
orderJS = "-";
JSONObject data = new JSONObject();
--
Gitblit v1.8.0