From d8fc7a24f8a2be1bc62aa38083a9f3dd3fbb3dc4 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 21 二月 2019 17:40:55 +0800
Subject: [PATCH] 封禁用户相关操作

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
index 66b5c62..d52211c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java
@@ -94,6 +94,7 @@
 import com.yeshi.fanli.service.inter.lable.QualityGoodsService;
 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.taobao.TaoBaoGoodsUpdateService;
 import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService;
 import com.yeshi.fanli.service.inter.user.ShamUserService;
@@ -229,6 +230,9 @@
 
 	@Resource
 	private UserCustomSettingsService userCustomSettingsService;
+
+	@Resource
+	private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
 
 	@RequestMapping(value = "getrecommendsection")
 	public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -2044,10 +2048,13 @@
 
 		JSONObject shareActivity = new JSONObject();
 		shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
-				new BigDecimal(configService.get("share_activity_proportion")).divide(new BigDecimal(100))));
+				new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
 		shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
 
-		data.put("shareActivity", shareActivity);
+		if (!StringUtil.isNullOrEmpty(uid)
+				&& shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+		} else
+			data.put("shareActivity", shareActivity);
 
 		out.print(JsonUtil.loadTrueResult(data));
 

--
Gitblit v1.8.0