From 8e30aa7c1f0384f09278699318b4902b815b42a7 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 26 四月 2019 18:01:25 +0800
Subject: [PATCH] 维权返利初步修改，拼多多初步增加
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 f6f3d0d..a41c2ea 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
@@ -19,8 +19,8 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
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.TBPid;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoLink;
import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
@@ -33,7 +33,6 @@
import com.yeshi.fanli.service.inter.config.SystemConfigService;
import com.yeshi.fanli.service.inter.goods.ShareGoodsService;
import com.yeshi.fanli.service.inter.goods.SuperRecommendBannerService;
-import com.yeshi.fanli.service.inter.goods.SuperRecommendSectionService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
@@ -41,6 +40,7 @@
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
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.ThreadUtil;
@@ -58,9 +58,6 @@
@Resource
private SuperRecommendBannerService superRecommendBannerService;
-
- @Resource
- private SuperRecommendSectionService superRecommendSectionService;
@Resource
private HongBaoManageService hongBaoManageService;
@@ -103,7 +100,8 @@
@RequestMapping(value = "getRecommenBanner", method = RequestMethod.GET)
public void getRecommendBanner(AcceptData acceptData, String callback, PrintWriter out) {
- BusinessSystem system = businessSystemService.getBusinessSystem("WEB", Constant.systemCommonConfig.getH5PackageName());
+ BusinessSystem system = businessSystemService.getBusinessSystem("WEB",
+ Constant.systemCommonConfig.getH5PackageName());
JSONObject json = new JSONObject();
if (system == null) {
out.print(JsonUtil.loadFalseResult(1, H5ControllerUtil.NOSYSTEM));
@@ -143,7 +141,6 @@
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));
return;
}
-
/**
*
@@ -198,7 +195,7 @@
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
.getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);
String pid = null;
- TBPid tbPid = tbPidService.getTBPid(Long.parseLong(uid), PidUser.TYPE_SHARE_GOODS);
+ ClientTBPid tbPid = tbPidService.getSharePid();
if (tbPid != null)
pid = tbPid.getPid();
else {
@@ -230,7 +227,7 @@
} else {
List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService
.getConfigByTypeCache(PidUser.TYPE_SHARE_GOODS);
- String pid = configList.get(0).getDefaultPid();
+ String pid = tbPidService.getSharePid().getPid();
TaoKeAppInfo app = new TaoKeAppInfo();
app.setAdzoneId(pid.split("_")[3]);
app.setAppKey(configList.get(0).getAppKey());
@@ -248,6 +245,13 @@
if (!StringUtil.isNullOrEmpty(goods.getCouponLink())) {
url = goods.getCouponLink();
}
+ if (!url.contains("uland.taobao.com") && !url.contains("s.click.taobao.com")) {
+ TaoBaoGoodsBrief linkInfo = TaoKeApiUtil.specialConvertCoupon(Long.parseLong(id), app);
+ url = linkInfo.getCouponLink();
+ if (StringUtil.isNullOrEmpty(url))
+ url = linkInfo.getAuctionUrl();
+ }
+
token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), url);
}
}
@@ -273,13 +277,24 @@
goods.setImgList(new ArrayList<>());
goods.getImgList().add(0, TbImgUtil.getTBSizeImg(goods.getPictUrl(), 300));
data.put("imgs", goods.getImgList());
+ data.put("couponPrice", afterCouponPrice);
+ // 鑰佺増鏈吋瀹�
data.put("quanPrice", afterCouponPrice);
data.put("zkPrice", goods.getZkPrice());
data.put("shareContent", "闀挎寜澶嶅埗鏈鏂囧瓧锛屾墦寮�銆愭墜鏈烘窐瀹濄�戝嵆鍙鍙栥�愮壒鍒紭鎯犲埜銆戣喘涔颁笅鍗曪紝");
data.put("token", link.getTaoToken());
- data.put("quan", !StringUtil.isNullOrEmpty(goods.getCouponInfo()));
data.put("reservePrice", goods.getReservePrice());
data.put("shopType", goods.getUserType() == 1 ? 2 : 1);
+ if (!StringUtil.isNullOrEmpty(goods.getCouponInfo()) && !"鏃�".equalsIgnoreCase(goods.getCouponInfo())) {
+ data.put("couponAmount", MoneyBigDecimalUtil.getWithNoZera(goods.getCouponAmount()));
+ data.put("coupon", true);
+ // 鑰佺増鏈吋瀹�
+ data.put("quan", true);
+ } else {
+ data.put("coupon", false);
+ // 鑰佺増鏈吋瀹�
+ data.put("quan", true);
+ }
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
final String tempUid = uid;
--
Gitblit v1.8.0