From c573834c796cc77057455ef0b3d8d0412f9792b9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 二月 2019 14:51:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 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 6948e15..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) {
@@ -2047,7 +2051,10 @@
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