From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
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 3bed881..bf8e5e7 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.util.SystemInfoUtil;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
@@ -14,6 +15,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 +33,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
/**
* 鑾峰彇娣樺疂鎺堟潈淇℃伅
*
@@ -57,11 +62,18 @@
return;
}
- if (!"1".equalsIgnoreCase(configService.get(ConfigKeyEnum.openSpeicalAndRelationApply.getKey()))) {
+ if (!"1".equalsIgnoreCase(configService.getValue(ConfigKeyEnum.openSpeicalAndRelationApply.getKey(), SystemInfoUtil.getSystem(acceptData)))) {
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()) {
@@ -76,12 +88,12 @@
}
}
- boolean canParse = "0".equalsIgnoreCase(configService.get(ConfigKeyEnum.autoFindTaobaoOrder.getKey())) ? false : true;
+ 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 orderJS = configService.get(ConfigKeyEnum.taobaoOrderParseJS.getKey());
+ String orderJS = configService.getValue(ConfigKeyEnum.taobaoOrderParseJS.getKey(),SystemInfoUtil.getSystem(acceptData));
if (!canParse)
orderJS = "-";
JSONObject data = new JSONObject();
--
Gitblit v1.8.0