From 42411e4a26461229c6bca6e89ca55e98a80f5a4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 30 九月 2021 18:08:17 +0800
Subject: [PATCH] bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index 1f24bcd..09862db 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -1,13 +1,18 @@
package com.yeshi.fanli.controller.client.v1;
import java.io.PrintWriter;
+import java.util.Date;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.SystemFunction;
+import com.yeshi.fanli.entity.SystemPIDInfo;
import com.yeshi.fanli.exception.taobao.TaoBaoConvertLinkException;
+import com.yeshi.fanli.lijin.manager.UserLijinMnager;
+import com.yeshi.fanli.service.inter.user.UserFunctionsLimitService;
+import com.yeshi.fanli.service.manger.PIDManager;
import com.yeshi.fanli.service.manger.goods.TaoBaoLinkManager;
import com.yeshi.fanli.util.SystemInfoUtil;
import org.springframework.stereotype.Controller;
@@ -93,6 +98,15 @@
@Resource
private TaoBaoLinkManager taoBaoLinkManager;
+ @Resource
+ private PIDManager pidManager;
+
+ @Resource
+ private UserLijinMnager userLijinMnager;
+
+ @Resource
+ private UserFunctionsLimitService userFunctionsLimitService;
+
private void doTaoLiJinBuy(AcceptData acceptData, Long uid, Long auctionId, PrintWriter out) {
JSONObject data = new JSONObject();
TaoBaoLink taoBaoLink = null;
@@ -135,13 +149,9 @@
HttpServletRequest request, PrintWriter out) {
try {
- String pid = TaoBaoConstant.TAOBAO_COUPON_PID;
+ String pid = pidManager.getPidCache(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.coupon);
- if (acceptData.getSystem() == SystemEnum.yhqjx) {
- pid="mm_124933865_56750082_19510050154";
- }
-
- TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForRecieveCoupon(auctionId, null, pid);
+ TaoBaoLink taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForRecieveCoupon(acceptData.getSystem(), auctionId, null, pid);
JSONObject data = new JSONObject();
JSONObject link = new JSONObject();
link.put("clickUrl", taoBaoLink.getClickUrl());
@@ -178,6 +188,12 @@
return;
}
+ //棰嗗埜
+ if (uid == null) {
+ getTaoBaoLinkWithoutFanLi(acceptData, auctionId, from, source, request, out);
+ return;
+ }
+
if (uid == null || uid <= 0) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛ID涓嶈兘涓虹┖"));
return;
@@ -187,6 +203,10 @@
UserInfo user = userInfoService.getUserByIdWithMybatis(uid);
if (user != null && user.getState() != UserInfo.STATE_NORMAL) {
out.print(JsonUtil.loadFalseResult(Constant.CODE_FORBIDDEN_USER, Constant.FORBIDDEN_USER_REASON_DESC));
+ return;
+ }
+ if (userFunctionsLimitService.isLimit(uid, SystemFunction.fanli, new Date())) {
+ out.print(JsonUtil.loadFalseResult(1, "璇ュ姛鑳介檺鍒朵娇鐢�"));
return;
}
@@ -222,9 +242,9 @@
String dpid = null;
if (TaoBaoUtil.isSpecialGoods(goods.getMaterialLibType())) {
- dpid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+ dpid = pidManager.getPid(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli);
} else {
- dpid = TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID;
+ dpid = pidManager.getPid(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanliChannel);
}
String psiteId = dpid.split("_")[2];
String padzoneId = dpid.split("_")[3];
@@ -256,7 +276,7 @@
} else
isNative = false;
- pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
+ pid = pidManager.getPid(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanli);
} else {// 灏氭湭缁戝畾
isNative = true;
@@ -278,7 +298,7 @@
}
if (taoBaoLink == null) {
- taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId, specialId, null);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(acceptData.getSystem(), uid, auctionId, specialId, null);
if (taoBaoLink != null)
clientTBPid = null;
}
@@ -293,7 +313,7 @@
taoBaoLink = shareGoodsService.getTaoBaoLink(uid, auctionId,
tbPidService.getIOSDefault().getPid());
} else
- taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(uid, auctionId, specialId, null);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForBuy(acceptData.getSystem(), uid, auctionId, specialId, null);
LogHelper.test("璐拱杞摼:榛樿PID杞摼-" + uid + "锛�" + auctionId);
}
} else {// 涓嶆槸杩斿埄搴撶殑鍟嗗搧锛岀敤鐗规畩PID鏇夸唬
@@ -305,10 +325,10 @@
if (!StringUtil.isNullOrEmpty(relationId)) {//
if (source != null && "taolijin_free_buy".equals(source)) {
taoBaoLink = taoBaoLinkManager.getTaoLiJinLinkForBuy(uid, auctionId,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+ pidManager.getPid(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanliChannel));
} else {
- taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(uid, auctionId, relationId,
- TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID);
+ taoBaoLink = taoBaoLinkManager.getTaoBaoLinkForShare(acceptData.getSystem(), uid, auctionId, relationId,
+ pidManager.getPid(acceptData.getSystem(), Constant.SOURCE_TYPE_TAOBAO, SystemPIDInfo.PidType.fanliChannel));
}
data.put("native", true);
@@ -330,6 +350,9 @@
data.put("link", link);
if (clientTBPid != null)
data.put("tbPidInfo", clientTBPid);
+
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
+
out.print(JsonUtil.loadTrueResult(data));
TaoKeLogHelper.convertLinkInfo(
@@ -393,6 +416,8 @@
data.put("native", true);
}
+ data.put("userLevel", userLijinMnager.getUserLevelInfo(uid, acceptData.getSystem()));
+
out.print(JsonUtil.loadTrueResult(data));
} else {
out.print(JsonUtil.loadFalseResult(1, "璇锋眰澶辫触"));
--
Gitblit v1.8.0