From 9b55262bb45c81c997ab04e55e8de13e14b8ca7d Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 29 十月 2019 15:11:37 +0800
Subject: [PATCH] 商品最高返

---
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java |   20 ++------------------
 1 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
index e8c81df..3c6bcc9 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/RecommendController.java
@@ -88,20 +88,19 @@
 import com.yeshi.fanli.service.inter.homemodule.SpecialService;
 import com.yeshi.fanli.service.inter.homemodule.SuperSpecialService;
 import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
 import com.yeshi.fanli.service.inter.lable.QualityFlashSaleService;
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 import com.yeshi.fanli.service.inter.money.UserMoneyExtraService;
 import com.yeshi.fanli.service.inter.monitor.MonitorService;
 import com.yeshi.fanli.service.inter.order.OrderService;
 import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
+import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
 import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoShopService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService;
 import com.yeshi.fanli.service.inter.tlj.ConfigTaoLiJinService;
-import com.yeshi.fanli.service.inter.tlj.DeviceTaoLiJinRecordService;
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;
 import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinRecordService;
 import com.yeshi.fanli.service.inter.user.ShamUserService;
@@ -252,9 +251,6 @@
 
 	@Resource
 	private ConfigTaoLiJinService configTaoLiJinService;
-
-	@Resource
-	private DeviceTaoLiJinRecordService deviceTaoLiJinRecordService;
 
 	@Resource
 	private DeviceSexService deviceSexService;
@@ -618,7 +614,7 @@
 
 		// 鑾峰彇娣樺鍙傛暟
 		ClientTBPid clientTBPid = null;
-		if (simpleGoods.getMaterialLibType() != null && simpleGoods.getMaterialLibType() == 1) {
+		if (TaoBaoUtil.isSpecialGoods(simpleGoods.getMaterialLibType())) {
 			String pid = TaoBaoConstant.TAOBAO_SPECIAL_PID_DEFAULT;
 			clientTBPid = new ClientTBPid(TaoBaoConstant.TAOBAO_AUTH_APPKEY, TaoBaoConstant.TAOBAO_AUTH_APPSECRET,
 					pid.split("_")[2], pid.split("_")[3]);
@@ -2577,18 +2573,6 @@
 			String name = special.getName();
 			if (StringUtil.isNullOrEmpty(name)) {
 				continue;
-			}
-
-			// 鏄惁闇�瑕佸脊鍑烘
-			if (name.equals("璐︽埛绛夌骇鐗规潈")) {
-				if (!VersionUtil.greaterThan_1_5_60(acceptData.getPlatform(), acceptData.getVersion())) {
-					list.remove(i);
-					i--;
-				} else {
-					if (uid != null) {
-						special.setElastic(userTaoLiJinOriginService.hasRankHongBao(uid));
-					}
-				}
 			}
 		}
 

--
Gitblit v1.8.0