From d46dea27b6ec3e0fb32ec7d137699e9fc7d609b0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 12 十二月 2019 14:18:11 +0800
Subject: [PATCH] 订单补贴消息修改

---
 fanli/src/main/java/com/yeshi/fanli/controller/web/ShareHotGoodsController.java |   10 +++++++---
 1 files changed, 7 insertions(+), 3 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..4a189f4 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
@@ -18,7 +18,7 @@
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
 import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
 import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.util.StringUtil;
@@ -59,6 +59,11 @@
 			array.add(gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goods, "100", null)));
 		}
 		out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(array)));
+		
+		
+
+
+		
 	}
 
 	/**
@@ -89,8 +94,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