From eb214553bde0ff87d9c3d4cb9187db3b4e3cbcea Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 20 八月 2019 17:32:32 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
index 95a0dc6..e087614 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java
@@ -89,8 +89,7 @@
if (goods != null && goods.getCouponAmount() != null
&& goods.getCouponAmount().compareTo(new BigDecimal(0)) > 0) {
- if (TaoBaoUtil.getAfterUseCouplePrice(goods).multiply(goods.getTkRate())
- .compareTo(new BigDecimal("734")) >= 0) {
+ if (TaoBaoUtil.canAddToTLJBuyGoods(goods)) {
count++;
goods = daTaoKeGoodsDetailService.filterTaoBaoGoods(goods);
shareHotGoodsService.addShareHotGoods(new ShareHotGoods(null, day, new Date(), goods));
--
Gitblit v1.8.0