From 480fa41fa7ee8b3b3a38f46f28c2b8403299b44d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 24 六月 2019 09:19:44 +0800
Subject: [PATCH] 分类商品列表的bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 67 +++++++++++++++++++++++++++++++++
1 files changed, 66 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 a41c2ea..7991f99 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
@@ -10,6 +10,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
+import org.yeshi.utils.HttpUtil;
import org.yeshi.utils.JsonUtil;
import org.yeshi.utils.taobao.TbImgUtil;
@@ -143,6 +144,63 @@
}
/**
+ * 澶勭悊鏉′欢
+ *
+ * @param uid
+ * @param tid
+ * @param out
+ */
+ private void doTaoLiJin(String callback, Long uid, Long tid, PrintWriter out) {
+ String tljLink = "";
+ Long auctionId = null;
+ BigDecimal tljMoney=null;
+ TaoBaoGoodsBrief goods = null;
+ try {
+ goods = redisManager.getTaoBaoGoodsBrief(auctionId);
+ } catch (TaobaoGoodsDownException e) {
+ }
+
+ if (goods == null) {// 宸茬粡涓嬬嚎
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍟嗗搧淇℃伅鑾峰彇澶辫触")));
+ return;
+ }
+
+ String token = redisManager.getTLJToken(tljLink);
+ if (StringUtil.isNullOrEmpty(token)) {
+ token = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), tljLink);
+ }
+
+ // 鍒稿悗浠�
+ BigDecimal afterCouponPrice = TaoBaoUtil.getAfterUseCouplePrice(goods);
+ TaoBaoLink link = new TaoBaoLink();
+ link.setTaoToken(token);
+
+ JSONObject data = new JSONObject();
+ data.put("title", goods.getTitle());
+ if (goods.getImgList() == null)
+ 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("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);
+ } else {
+ data.put("coupon", false);
+ }
+ data.put("tljMoney", tljMoney);
+
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
+ }
+
+ /**
*
* 鏂规硶璇存槑: 鑾峰彇鍟嗗搧璇︽儏
*
@@ -155,17 +213,24 @@
@SuppressWarnings("unused")
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
- public void getGoodsDetail(final AcceptData acceptData, final String id, String uid, String callback,
+ public void getGoodsDetail(final AcceptData acceptData, final String id, Long tid, String uid, String callback,
PrintWriter out) {
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
out.print(JsonUtil.loadFalseResult(1, "璇蜂笂浼爄d"));
return;
}
+
if (!StringUtil.isNullOrEmpty(uid)) {
uid = AESUtil.decrypt(uid, Constant.UIDAESKEY);
}
+ if (tid != null && tid != 0) {
+ doTaoLiJin(callback, StringUtil.isNullOrEmpty(uid) || Long.parseLong(uid) == 0 ? null : Long.parseLong(uid),
+ tid, out);
+ return;
+ }
+
TaoBaoGoodsBrief goods = null;
String token = null;
if (!StringUtil.isNullOrEmpty(uid)) {
--
Gitblit v1.8.0