From 28a0efc6ec16f3f82eb8e16e87269300d6744fd4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 25 九月 2019 19:18:17 +0800
Subject: [PATCH] 金币版本拦截与频率拦截bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 89 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
index 1e68bca..598a407 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java
@@ -34,6 +34,7 @@
import com.yeshi.fanli.exception.share.ShareGoodsException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
@@ -45,11 +46,13 @@
import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.AESUtil;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
@@ -99,10 +102,12 @@
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
-
+
@Resource
private UserTaoLiJinRecordService userTaoLiJinRecordService;
-
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
/**
*
@@ -171,11 +176,11 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍟嗗搧淇℃伅鑾峰彇澶辫触")));
return;
}
-
+
Long auctionId = record.getGoodsId();
String tljLink = record.getSendUrl();
- BigDecimal tljMoney= record.getPerFace();
-
+ BigDecimal tljMoney = record.getPerFace();
+
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(auctionId);
@@ -217,9 +222,9 @@
} else {
data.put("coupon", false);
}
-
+
data.put("tljMoney", tljMoney);
-
+
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
}
@@ -238,6 +243,7 @@
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
public void getGoodsDetail(final AcceptData acceptData, final String id, String tid, String uid, String callback,
PrintWriter out) {
+ LogHelper.shareGoods("鍒嗕韩鍑哄幓鐨凥5璁块棶: uid:" + uid + " id:" + id);
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
@@ -281,22 +287,14 @@
}
} else {// 娌℃湁鍒嗕韩璁板綍锛岄渶瑕佺洿鎺ュ垎浜�
- List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
- .getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);
- String pid = null;
- ClientTBPid tbPid = tbPidService.getSharePid();
- if (tbPid != null)
- pid = tbPid.getPid();
- else {
- pid = configList.get(0).getDefaultPid();
- }
-
+ LogHelper.test("娌℃湁鍒嗕韩璁板綍:uid:" + uid + " actionid:" + id);
// 鑾峰彇
TaoKeAppInfo app = new TaoKeAppInfo();
- app.setAdzoneId(pid.split("_")[3]);
- app.setAppKey(configList.get(0).getAppKey());
- app.setAppSecret(configList.get(0).getAppSecret());
- app.setPid(pid);
+ app.setPid(TaoBaoConstant.TAOBAO_RELATION_PID_DEFAULT);
+ app.setAdzoneId(app.getPid().split("_")[3]);
+ app.setAppKey(TaoBaoConstant.TAOBAO_AUTH_APPKEY);
+ app.setAppSecret(TaoBaoConstant.TAOBAO_AUTH_APPSECRET);
+
try {
goods = TaoKeApiUtil.searchGoodsDetail(Long.parseLong(id), app);
} catch (NumberFormatException e) {
@@ -309,6 +307,9 @@
if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {
url = goods.getCouponLink();
}
+ String relationId = userExtraTaoBaoInfoService.getRelationIdByUid(Long.parseLong(uid));
+ if (!StringUtil.isNullOrEmpty(relationId))
+ url += "&relationId=" + relationId;
token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), url);
}
}
@@ -384,7 +385,7 @@
// 鑰佺増鏈吋瀹�
data.put("quan", true);
}
-
+
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
final String tempUid = uid;
@@ -404,11 +405,10 @@
});
return;
}
-
-
-
+
/**
* 浜笢鍒嗕韩鍟嗗搧淇℃伅
+ *
* @param acceptData
* @param id
* @param uid
@@ -416,7 +416,7 @@
* @param out
*/
@RequestMapping(value = "getJDGoodsDetail")
- public void getJDGoodsDetail(final AcceptData acceptData, final Long id, String uid, String callback,
+ public void getJDGoodsDetail(final AcceptData acceptData, final Long id, String uid, String callback,
PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
@@ -442,7 +442,7 @@
imageList = new ArrayList<>();
imageList.add(jdGoods.getPicUrl());
}
-
+
boolean hasCoupon = false;
String couponUrl = null;
BigDecimal discount = new BigDecimal(0);
@@ -452,30 +452,31 @@
discount = couponInfo.getDiscount();
couponUrl = couponInfo.getLink();
}
-
+
boolean jdzy = false;
String owner = jdGoods.getOwner();
if (!StringUtil.isNullOrEmpty(owner) && "g".equalsIgnoreCase(owner)) {
jdzy = true;
}
-
+
String materialId = "https://item.jd.com/" + id + ".html";
String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
-
+
int priceType = 1;
- BigDecimal price = jdGoods.getPrice();;
+ BigDecimal price = jdGoods.getPrice();
+ ;
JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();
if (pinGouInfo != null) {
priceType = 2; // 鎷艰喘浠�
- price = pinGouInfo.getPingouPrice();
+ price = pinGouInfo.getPingouPrice();
}
-
+
JSONObject data = new JSONObject();
data.put("jdzy", jdzy);
data.put("imgs", imageList);
data.put("title", jdGoods.getSkuName());
data.put("zkPrice", price);
- data.put("priceType", priceType);
+ data.put("priceType", priceType);
data.put("coupon", hasCoupon);
data.put("couponAmount", discount);
data.put("couponPrice", JDUtil.getQuanPrice(jdGoods));
@@ -489,7 +490,8 @@
public void run() {
try {
if (!StringUtil.isNullOrEmpty(tempUid))
- userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id, Constant.SOURCE_TYPE_JD);
+ userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id,
+ Constant.SOURCE_TYPE_JD);
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (UserShareGoodsRecordException e) {
@@ -499,10 +501,10 @@
});
return;
}
-
-
+
/**
* 鎷煎澶氬垎浜晢鍝佽鎯�
+ *
* @param acceptData
* @param id
* @param uid
@@ -510,7 +512,7 @@
* @param out
*/
@RequestMapping(value = "getPDDGoodsDetail")
- public void getPDDGoodsDetail(final AcceptData acceptData, final Long id, String uid, String callback,
+ public void getPDDGoodsDetail(final AcceptData acceptData, final Long id, String uid, String callback,
PrintWriter out) {
if (id == null) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
@@ -526,7 +528,7 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍟嗗搧淇℃伅鑾峰彇澶辫触")));
return;
}
-
+
List<String> imageList = null;
String[] goodsGalleryUrls = pddGoods.getGoodsGalleryUrls();
if (goodsGalleryUrls != null) {
@@ -539,7 +541,7 @@
imageList.add(goodsImageUrl);
}
}
-
+
BigDecimal hundred = new BigDecimal(100);
Boolean hasCoupon = pddGoods.getHasCoupon();
BigDecimal amount = new BigDecimal(0);
@@ -548,9 +550,9 @@
} else {
hasCoupon = false;
}
-
+
String jumpLink = PinDuoDuoApiUtil.getPromotionUrl(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);
-
+
JSONObject data = new JSONObject();
data.put("imgs", imageList);
data.put("title", pddGoods.getGoodsName());
@@ -568,7 +570,8 @@
public void run() {
try {
if (!StringUtil.isNullOrEmpty(tempUid))
- userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id, Constant.SOURCE_TYPE_PDD);
+ userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id,
+ Constant.SOURCE_TYPE_PDD);
} catch (NumberFormatException e) {
e.printStackTrace();
} catch (UserShareGoodsRecordException e) {
--
Gitblit v1.8.0