From b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 09 七月 2019 17:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 fcec960..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
@@ -156,8 +156,6 @@
* @param out
*/
private void doTaoLiJin(String callback, Long uid, Long tid, PrintWriter out) {
- String tljLink = "";
-
// 鏌ヨ鍟嗗搧娣樼ぜ閲�
UserTaoLiJinRecord record = userTaoLiJinRecordService.selectByPrimaryKey(tid);
if (record == null) {
@@ -166,6 +164,7 @@
}
Long auctionId = record.getGoodsId();
+ String tljLink = record.getSendUrl();
BigDecimal tljMoney= record.getPerFace();
TaoBaoGoodsBrief goods = null;
@@ -228,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)) {
@@ -240,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;
}
--
Gitblit v1.8.0