From bc6df1cbd259c80539d11ae0107ccb938b570266 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 26 八月 2019 10:15:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
index a6bfe0a..6218b4d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/GoodsController.java
@@ -41,7 +41,6 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TaoBaoConstant;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.MonitorFactory;
import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
@@ -119,10 +118,7 @@
data.put("link", link);
out.print(JsonUtil.loadTrueResult(data));
- // 1.6.5 鑷喘绔嬪噺娣诲姞 閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addTaoLiJinBuy(uid, auctionId);
-
+ integralGetService.addTaoLiJinBuy(uid, auctionId);
}
/**
@@ -288,8 +284,7 @@
out.print(JsonUtil.loadTrueResult(data));
// 鑾峰緱閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addCouponRebate(uid);
+ integralGetService.addCouponRebate(uid);
} catch (Exception e) {
@@ -424,8 +419,7 @@
out.print(JsonUtil.loadTrueResult(""));
// 鑾峰緱閲戝竵
- if (VersionUtil.greaterThan_1_6_5(acceptData.getPlatform(), acceptData.getVersion()))
- integralGetService.addCloseRecommendGoods(uid);
+ integralGetService.addCloseRecommendGoods(uid);
}
}
--
Gitblit v1.8.0