From 2147d023563a7c9d05d97547c00d6b0162c0644c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 09 十一月 2020 18:37:24 +0800
Subject: [PATCH] 刷单风险规则优化
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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 598a407..ff31600 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
@@ -25,16 +25,17 @@
import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.BusinessSystem;
-import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.goods.facade.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.TaoKeAppInfo;
+import com.yeshi.common.entity.taobao.TaoKeAppInfo;
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.log.LogManager;
+import com.yeshi.fanli.log.LogType;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemConfigService;
@@ -49,7 +50,7 @@
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 org.yeshi.utils.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
@@ -121,7 +122,7 @@
public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {
BusinessSystem system = businessSystemService.getBusinessSystem("WEB",
- Constant.systemCommonConfig.getH5PackageName());
+ Constant.systemCommonConfig.getH5PackageName(),acceptData.getSystem());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));
@@ -213,7 +214,7 @@
data.put("quanPrice", afterCouponPrice);
data.put("zkPrice", goods.getZkPrice());
data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
- data.put("token", link.getTaoToken());
+ data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));
data.put("reservePrice", goods.getReservePrice());
data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
@@ -243,7 +244,12 @@
@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);
+ if (!StringUtil.isNullOrEmpty(uid))
+ uid = uid.replace(" ", "+");
+
+ LogManager.getLogger(LogType.taobaoTrade)
+ .info(String.format("娣樺疂鍒嗕韩鍟嗗搧H5璁块棶:\n 鍟嗗搧ID:%s \n 鍘熷鐢ㄦ埛ID:%s \n", id, uid));
+
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
@@ -336,7 +342,7 @@
url = goods.getCouponLink();
}
if (!url.contains("uland.taobao.com") && !url.contains("s.click.taobao.com")) {
- TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(Long.parseLong(id), app);
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(Long.parseLong(id), app,null,null);
url = linkInfo.getCouponLink();
if (StringUtil.isNullOrEmpty(url))
url = linkInfo.getAuctionUrl();
@@ -372,7 +378,7 @@
data.put("quanPrice", afterCouponPrice);
data.put("zkPrice", goods.getZkPrice());
data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
- data.put("token", link.getTaoToken());
+ data.put("token", TaoBaoUtil.filterTaoToken(link.getTaoToken()));
data.put("reservePrice", goods.getReservePrice());
data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
@@ -446,7 +452,7 @@
boolean hasCoupon = false;
String couponUrl = null;
BigDecimal discount = new BigDecimal(0);
- JDCouponInfo couponInfo = jdGoods.getCouponInfo();
+ JDCouponInfo couponInfo = JDUtil.getShowCouponInfo(jdGoods);
if (couponInfo != null) {
hasCoupon = true;
discount = couponInfo.getDiscount();
@@ -460,7 +466,8 @@
}
String materialId = "https://item.jd.com/" + id + ".html";
- String jumpLink = JDApiUtil.convertShortLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
+ String jumpLink = JDApiUtil.convertLinkWithSubUnionId(materialId, couponUrl, null,JDApiUtil.POSITION_SHARE + "",
+ uid);
int priceType = 1;
BigDecimal price = jdGoods.getPrice();
@@ -480,7 +487,7 @@
data.put("coupon", hasCoupon);
data.put("couponAmount", discount);
data.put("couponPrice", JDUtil.getQuanPrice(jdGoods));
- data.put("helpLink", configService.get("jd_share_h5_help_link"));
+ data.put("helpLink", configService.getValue("jd_share_h5_help_link",acceptData.getSystem()));
data.put("jumpLink", jumpLink);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -560,7 +567,7 @@
data.put("coupon", hasCoupon);
data.put("couponAmount", amount);
data.put("couponPrice", PinDuoDuoUtil.getQuanPrice(pddGoods));
- data.put("helpLink", configService.get("pdd_share_h5_help_link"));
+ data.put("helpLink", configService.getValue("pdd_share_h5_help_link",acceptData.getSystem()));
data.put("jumpLink", jumpLink);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
--
Gitblit v1.8.0