From 3824cbcaec6e6c67418d5280a53e9c2fedeef6f9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 11 七月 2019 16:34:13 +0800
Subject: [PATCH] 订单bug，分享爆款自购修改
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 45e7050..ea63ae3 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,7 +10,6 @@
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;
@@ -19,6 +18,7 @@
import com.yeshi.fanli.entity.bus.recommend.RecommendBanner;
import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;
import com.yeshi.fanli.entity.bus.su.recommend.SuperRecommendBanner;
+import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinRecord;
import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.ClientTBPid;
import com.yeshi.fanli.entity.taobao.PidUser;
@@ -156,9 +156,17 @@
* @param out
*/
private void doTaoLiJin(String callback, Long uid, Long tid, PrintWriter out) {
- String tljLink = "";
- Long auctionId = null;
- BigDecimal tljMoney=null;
+ // 鏌ヨ鍟嗗搧娣樼ぜ閲�
+ UserTaoLiJinRecord record = userTaoLiJinRecordService.selectByPrimaryKey(tid);
+ if (record == null) {
+ out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鍟嗗搧淇℃伅鑾峰彇澶辫触")));
+ return;
+ }
+
+ Long auctionId = record.getGoodsId();
+ String tljLink = record.getSendUrl();
+ BigDecimal tljMoney= record.getPerFace();
+
TaoBaoGoodsBrief goods = null;
try {
goods = redisManager.getTaoBaoGoodsBrief(auctionId);
@@ -200,6 +208,7 @@
} else {
data.put("coupon", false);
}
+
data.put("tljMoney", tljMoney);
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
@@ -218,7 +227,7 @@
@SuppressWarnings("unused")
@RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)
- public void getGoodsDetail(final AcceptData acceptData, final String id, Long tid, String uid, String callback,
+ public void getGoodsDetail(final AcceptData acceptData, final String id, String tid, String uid, String callback,
PrintWriter out) {
long begin = java.lang.System.currentTimeMillis();
if (StringUtil.isNullOrEmpty(id)) {
@@ -230,9 +239,10 @@
uid = AESUtil.decrypt(uid, Constant.UIDAESKEY);
}
- if (tid != null && tid != 0) {
+ if (!StringUtil.isNullOrEmpty(tid)) {
+ tid = AESUtil.decrypt(tid, Constant.UIDAESKEY);
doTaoLiJin(callback, StringUtil.isNullOrEmpty(uid) || Long.parseLong(uid) == 0 ? null : Long.parseLong(uid),
- tid, out);
+ Long.parseLong(tid), out);
return;
}
@@ -364,13 +374,6 @@
data.put("coupon", false);
// 鑰佺増鏈吋瀹�
data.put("quan", true);
- }
-
-
- // 鏌ヨ鍟嗗搧娣樼ぜ閲�
- BigDecimal taoLiJin = userTaoLiJinRecordService.getShareHongBaoByUidAndGoodsId(Long.parseLong(uid), Long.parseLong(id));
- if (taoLiJin != null && taoLiJin.compareTo(new BigDecimal(0)) == 1) {
- data.put("taoLiJin", "鍙幏娣樼ぜ閲戠孩鍖� 楼" + taoLiJin);
}
out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(data)));
--
Gitblit v1.8.0