From 1340beb67a9b6d777821d0139bcc7c9b0896ed4e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 10:59:26 +0800
Subject: [PATCH] 拼多多比价修改
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 06c96ed..ab99ac0 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
@@ -26,10 +26,10 @@
import com.yeshi.fanli.entity.jd.JDGoods;
import com.yeshi.fanli.entity.system.BusinessSystem;
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;
@@ -50,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;
@@ -122,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));
@@ -342,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();
@@ -487,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));
@@ -567,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