From 8ce7c720e4e7a604b0ff770349b5556f39d37759 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 九月 2021 11:44:38 +0800
Subject: [PATCH] 好省呗应用兼容
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 64 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
index 0f9f73e..510c2fe 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java
@@ -19,6 +19,12 @@
import javax.servlet.http.HttpServletRequest;
import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.entity.SystemPIDInfo;
+import com.yeshi.fanli.entity.bus.user.*;
+import com.yeshi.fanli.exception.user.*;
+import com.yeshi.fanli.service.inter.pdd.PDDAuthService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -48,19 +54,7 @@
import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;
import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.AccountMessage;
-import com.yeshi.fanli.entity.bus.user.BindRemind;
-import com.yeshi.fanli.entity.bus.user.BindingAccount;
-import com.yeshi.fanli.entity.bus.user.Extract;
-import com.yeshi.fanli.entity.bus.user.ExtractRecord;
-import com.yeshi.fanli.entity.bus.user.LostOrder;
import com.yeshi.fanli.entity.bus.user.PreviewInfo.PreviewEnum;
-import com.yeshi.fanli.entity.bus.user.SMSHistory;
-import com.yeshi.fanli.entity.bus.user.ThreeSale;
-import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;
-import com.yeshi.fanli.entity.bus.user.UserActiveLog;
-import com.yeshi.fanli.entity.bus.user.UserInfo;
-import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserInfoModifyRecord.ModifyTypeEnum;
import com.yeshi.fanli.entity.bus.user.vip.GiveVIPApplyInfo;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
@@ -77,10 +71,6 @@
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
import com.yeshi.fanli.exception.taobao.TaoKeApiException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.exception.user.BindingAccountException;
-import com.yeshi.fanli.exception.user.UserCustomSettingsException;
-import com.yeshi.fanli.exception.user.UserInfoException;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.AdminUserService;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -148,9 +138,6 @@
private UserInfoService userInfoService;
@Resource
- private OrderService orderService;
-
- @Resource
private BindingAccountService bindingAccountService;
@Resource
@@ -162,8 +149,6 @@
@Resource
private BusinessSystemService businessSystemService;
- @Resource
- private ShamUserService shamUserService;
@Resource
private ThreeSaleSerivce threeSaleSerivce;
@@ -177,8 +162,6 @@
@Resource
private HongBaoManageService hongBaoManageService;
- @Resource
- private UserAccountService loginService;
@Resource
private RedisManager redisManager;
@@ -219,8 +202,6 @@
@Resource
private AppVersionService appVersionService;
- @Resource
- private HongBaoV2CountService hongBaoV2CountService;
@Resource
private AccountMessageService accountMessageService;
@@ -236,12 +217,6 @@
@Resource
private BindRemindService bindRemindService;
-
- @Resource
- private RedPackBalanceService redPackBalanceService;
-
- @Resource
- private UserRankService userRankService;
@Resource
private UserVIPInfoService userVIPInfoService;
@@ -269,6 +244,15 @@
@Resource
private PreviewInfoService previewInfoService;
+
+ @Resource
+ private PDDAuthService pddAuthService;
+
+ @Resource
+ private PIDManager pidManager;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
private static final String EXTRACT_MIN_MONEY = ConfigKeyEnum.extractMoneyMin.getKey();
private static final String EXTRACT_MAX_MONEY = ConfigKeyEnum.extractMoneyMAX.getKey();
@@ -2075,6 +2059,16 @@
userActiveLog.setDeviceType(acceptData.getDeviceType());
userActiveLog.setDevice(acceptData.getDevice());
userActiveLogService.addUserActiveLog(userActiveLog);
+ //鏄惁缁戝畾娣樺疂
+ UserExtraTaoBaoInfo taoBaoInfo = userExtraTaoBaoInfoService.getByUid(uid);
+ if (taoBaoInfo != null)
+ if (!StringUtil.isNullOrEmpty(taoBaoInfo.getSpecialId()) && taoBaoInfo.getSpecialValid() != null && taoBaoInfo.getSpecialValid()) {
+ if (!StringUtil.isNullOrEmpty(taoBaoInfo.getRelationId()) && taoBaoInfo.getRelationValid() != null && taoBaoInfo.getRelationValid()) {
+ userInfo.setTbName(taoBaoInfo.getTaoBaoNickName());
+ userInfo.setOpenid(taoBaoInfo.getTaoBaoUid() + "");
+ }
+ }
+
// 澶勭悊鐢ㄦ埛淇℃伅
outUserInfoHandle(userInfo);
@@ -2253,7 +2247,7 @@
vipAction.put("jumpDetail",
jumpDetailV2Service.getByTypeCache("web",
acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
- Integer.parseInt(acceptData.getVersion())));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
JSONObject params = new JSONObject();
params.put("url", userVipConfigService.getValueByKey("vip_manager_link"));
vipAction.put("params", params);
@@ -2269,7 +2263,7 @@
vipAction.put("jumpDetail",
jumpDetailV2Service.getByTypeCache("web",
acceptData.getPlatform().equalsIgnoreCase("android") ? 1 : 2,
- Integer.parseInt(acceptData.getVersion())));
+ Integer.parseInt(acceptData.getVersion()),acceptData.getSystem()));
JSONObject params = new JSONObject();
params.put("url", link.replace("[ID]", list.get(0).getId()));
vipAction.put("params", params);
@@ -2285,8 +2279,8 @@
data.put("user", JsonUtil.getConvertBigDecimalToStringBuilder(gsonBuilder).create().toJson(userInfo));
//鎷煎澶氭槸鍚︾粦瀹�
if (VersionUtil.greaterThan_2_1_5(acceptData.getPlatform(), acceptData.getVersion())) {
- boolean pddBuyBind = PinDuoDuoApiUtil.isAuth(PinDuoDuoApiUtil.PID_FANLI, PinDuoDuoUtil.getCustomParams(uid));
- boolean pddShareBind = PinDuoDuoApiUtil.isAuth(PinDuoDuoApiUtil.PID_SHARE, PinDuoDuoUtil.getCustomParams(uid));
+ boolean pddBuyBind = PinDuoDuoApiUtil.isAuth(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.fanli), pddAuthService.getFanliCustomParams(uid));
+ boolean pddShareBind = PinDuoDuoApiUtil.isAuth(pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_PDD, SystemPIDInfo.PidType.share), pddAuthService.getFanliCustomParams(uid));
data.put("pddBuyBind", pddBuyBind);
data.put("pddShareBind", pddShareBind);
}
--
Gitblit v1.8.0