From 30d8e227e8d823b6c38c3b9c90ac2df03b63befe Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 二月 2025 16:41:22 +0800
Subject: [PATCH] 淘宝转链接口更新
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 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 9c91bc6..fd30ade 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
@@ -20,7 +20,10 @@
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;
@@ -51,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;
@@ -80,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;
@@ -263,6 +250,9 @@
@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();
@@ -1311,6 +1301,10 @@
stateInfo = "璇ヨ鍗曠敵璇夊凡閫氳繃锛岃绋嶅悗鏌ョ湅銆�";
} else if (state == -5) {
stateInfo = "璇ヨ鍗曚负鍒嗕韩濂栭噾璁㈠崟";
+ } else if (state == -1001) {
+ stateInfo = "璇ヨ鍗曚负杩濊璁㈠崟";
+ } else if (state == -1002) {
+ stateInfo = "璇ヨ鍗曞凡鍙戣捣缁存潈";
}
}
JSONObject data = new JSONObject();
@@ -1402,7 +1396,7 @@
}
@RequestMapping("collectionGoods")
- public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, PrintWriter out) {
+ public void collectionGoods(AcceptData acceptData, long uid, String auctionId, int type, PrintWriter out) {
try {
CollectionGoodsV2 find = collectionGoodsV2Service.findByUidAndAuctionId(uid, auctionId,
Constant.SOURCE_TYPE_TAOBAO);
@@ -1442,7 +1436,7 @@
* @param out
*/
@RequestMapping("collectionGoodsJp")
- public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,
+ public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, String auctionId, Integer goodsType,
PrintWriter out) {
if (uid == null || auctionId == null) {
@@ -1500,7 +1494,7 @@
BigDecimal proportion = hongBaoManageService.getFanLiRate(acceptData.getSystem());
- List<Long> listGid = new ArrayList<Long>();
+ List<String> listGid = new ArrayList<>();
for (CollectionGoodsV2 collectionGoodsV2 : collectionGoodsList) {
CommonGoods commonGoods = collectionGoodsV2.getCommonGoods();
if (commonGoods == null) {
@@ -1528,9 +1522,9 @@
if (listTaoKeGoods != null && listTaoKeGoods.size() > 0) {
int state = 1; // 榛樿鍋滃敭
- Long goodsId = commonGoods.getGoodsId();
+ String goodsId = commonGoods.getGoodsId();
for (TaoBaoGoodsBrief taoKeGoods : listTaoKeGoods) {
- Long auctionId = taoKeGoods.getAuctionId();
+ String auctionId = taoKeGoods.getAuctionId();
if (goodsId == auctionId || goodsId.equals(auctionId)) {
state = 0; // 鍦ㄥ敭
break;
@@ -1577,7 +1571,7 @@
if (!StringUtil.isNullOrEmpty(ids)) {
Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {
try {
- collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),
+ collectionGoodsV2Service.cancelCollectionByAuctionId(uid, (auctionIdStr),
goodsType);
} catch (Exception e) {
e.printStackTrace();
@@ -2069,6 +2063,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);
@@ -2247,7 +2251,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);
@@ -2263,7 +2267,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);
--
Gitblit v1.8.0