From e1a62ec62e7331d97af9302e90e1ce44af8235eb Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 27 一月 2021 15:26:55 +0800 Subject: [PATCH] 拼多多授权绑定 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserAuthController.java | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 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 b488ca7..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,8 @@ 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; import org.springframework.web.bind.annotation.RequestMethod; @@ -61,15 +63,17 @@ 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; + + if(SystemInfoUtil.hasFunctions(acceptData.getSystem(), SystemFunction.threeSale)) { + String inviteCode = userInfoExtraService.getInviteCodeByUid(uid); + if (StringUtil.isNullOrEmpty(inviteCode)) { + out.print(JsonUtil.loadFalseResult(3, "璇锋縺娲婚個璇风爜")); + return; + } } @@ -87,12 +91,11 @@ } } - 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 link = TaoBaoUtil.getTaoBaoAuthLink(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