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 | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 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 a417a1b..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,8 +12,10 @@
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.UserExtraTaoBaoInfoService;
+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;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
@@ -30,6 +32,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+
/**
* 鑾峰彇娣樺疂鎺堟潈淇℃伅
*
@@ -56,10 +61,17 @@
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)) {
@@ -75,12 +87,17 @@
}
}
+ 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();
data.put("authLink", link);
+
try {
data.put("orderJS", DESUtil.encode(orderJS, StringUtil.getBase64String("YeShiFANLI889*+"),
StringUtil.getBase64String("*M#34f?,")));
@@ -88,15 +105,14 @@
e.printStackTrace();
}
- data.put("orderUrl", "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm");
+ if (!canParse)
+ data.put("orderUrl", "http://");
+ else
+ data.put("orderUrl", "https://buyertrade.taobao.com/trade/itemlist/list_bought_items.htm");
if (first)
out.print(JsonUtil.loadTrueResult(data));
else
out.print(JsonUtil.loadTrue(0, data, "娣樺疂鎺堟潈鏈垚鍔燂紝璇风◢鍚庡啀璇�"));
}
-
+
}
-
-
-
-
--
Gitblit v1.8.0