From 09476adf2ae2bcc2f6685dafe4707938fd82bc78 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 七月 2019 12:19:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 101 insertions(+), 1 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 5dc7028..ea72abc 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
@@ -3,6 +3,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import javax.annotation.Resource;
@@ -15,6 +16,8 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dto.jd.JDCouponInfo;
+import com.yeshi.fanli.dto.jd.JDPingouInfo;
+import com.yeshi.fanli.dto.pdd.PDDGoodsDetail;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
@@ -50,6 +53,8 @@
import com.yeshi.fanli.util.ThreadUtil;
import com.yeshi.fanli.util.jd.JDApiUtil;
import com.yeshi.fanli.util.jd.JDUtil;
+import com.yeshi.fanli.util.pinduoduo.PinDuoDuoApiUtil;
+import com.yeshi.fanli.util.pinduoduo.PinDuoDuoUtil;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -448,13 +453,29 @@
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.convertLink(materialId, couponUrl, JDApiUtil.POSITION_SHARE + "", uid);
+ int priceType = 1;
+ BigDecimal price = jdGoods.getPrice();;
+ JDPingouInfo pinGouInfo = jdGoods.getPinGouInfo();
+ if (pinGouInfo != null) {
+ priceType = 2; // 鎷艰喘浠�
+ price = pinGouInfo.getPingouPrice();
+ }
+
JSONObject data = new JSONObject();
+ data.put("jdzy", jdzy);
data.put("imgs", imageList);
data.put("title", jdGoods.getSkuName());
- data.put("zkPrice", jdGoods.getPrice());
+ data.put("zkPrice", price);
+ data.put("priceType", priceType);
data.put("coupon", hasCoupon);
data.put("couponAmount", discount);
data.put("couponPrice", JDUtil.getQuanPrice(jdGoods));
@@ -478,4 +499,83 @@
});
return;
}
+
+
+ /**
+ * 鎷煎澶氬垎浜晢鍝佽鎯�
+ * @param acceptData
+ * @param id
+ * @param uid
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "getPDDGoodsDetail")
+ public void getPDDGoodsDetail(final AcceptData acceptData, final Long id, String uid, String callback,
+ PrintWriter out) {
+ if (id == null) {
+ out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
+ return;
+ }
+
+ if (!StringUtil.isNullOrEmpty(uid)) {
+ uid = AESUtil.decrypt(uid, Constant.UIDAESKEY);
+ }
+
+ PDDGoodsDetail pddGoods = PinDuoDuoApiUtil.getGoodsDetail(id);
+ if (pddGoods == null) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍟嗗搧淇℃伅鑾峰彇澶辫触")));
+ return;
+ }
+
+ List<String> imageList = null;
+ String[] goodsGalleryUrls = pddGoods.getGoodsGalleryUrls();
+ if (goodsGalleryUrls != null) {
+ imageList = Arrays.asList(goodsGalleryUrls);
+ }
+ if (imageList == null) {
+ imageList = new ArrayList<>();
+ String goodsImageUrl = pddGoods.getGoodsImageUrl();
+ if (!StringUtil.isNullOrEmpty(goodsImageUrl)) {
+ imageList.add(goodsImageUrl);
+ }
+ }
+
+ BigDecimal hundred = new BigDecimal(100);
+ Boolean hasCoupon = pddGoods.getHasCoupon();
+ BigDecimal amount = new BigDecimal(0);
+ if (hasCoupon != null && hasCoupon) {
+ amount = MoneyBigDecimalUtil.div(new BigDecimal(pddGoods.getCouponDiscount()), hundred).setScale(2);
+ } else {
+ hasCoupon = false;
+ }
+
+ String jumpLink = PinDuoDuoApiUtil.convert(id, PinDuoDuoApiUtil.PID_SHARE + "", uid);
+
+ JSONObject data = new JSONObject();
+ data.put("imgs", imageList);
+ data.put("title", pddGoods.getGoodsName());
+ data.put("zkPrice", MoneyBigDecimalUtil.div(new BigDecimal(pddGoods.getMinGroupPrice()), hundred).setScale(2));
+ 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("jumpLink", jumpLink);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
+
+ final String tempUid = uid;
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ if (!StringUtil.isNullOrEmpty(tempUid))
+ userShareGoodsGroupService.updateBrowseNum(Long.parseLong(tempUid), id, Constant.SOURCE_TYPE_PDD);
+ } catch (NumberFormatException e) {
+ e.printStackTrace();
+ } catch (UserShareGoodsRecordException e) {
+ e.printStackTrace();
+ }
+ }
+ });
+ return;
+ }
}
--
Gitblit v1.8.0