From 41a4f9aa848255b97b4ad2bd76cb2dfa177df609 Mon Sep 17 00:00:00 2001
From: 喻健 <喻健@Admin>
Date: 星期五, 16 十一月 2018 17:40:14 +0800
Subject: [PATCH] 后台导航栏管理
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 0b9f081..baa4411 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
@@ -20,7 +20,7 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.IPUtil;
import org.yeshi.utils.JsonUtil;
-import org.yeshi.utils.NumberUtil;
+import org.yeshi.utils.NumberUtil;
import org.yeshi.utils.taobao.TbImgUtil;
import com.google.gson.Gson;
@@ -197,12 +197,13 @@
@Resource
private ShamUserService shamUserService;
+
@Resource
private SpecialService specialService;
@Resource
private SwiperPictureService swiperPictureService;
-
+
@Resource
private MonitorService monitorService;
@@ -1578,6 +1579,7 @@
out.print(JsonUtil.loadTrueResult(root));
}
+
/**
* 鏂扮増鎺ㄨ崘涓撻绠＄悊(1.4.0)
*
@@ -1686,7 +1688,7 @@
}
-
+
/**
* 鍟嗗搧鍩烘湰璇︽儏 (1.4.0)
*
@@ -1881,7 +1883,10 @@
BigDecimal shareMoney = taoBaoGoodsBriefService.getShareGoodsUserHongBao(tb);
data.put("shareMoney", "楼" + shareMoney);
// 鍒嗕韩璧氫汉鎻愮ず
- List<ShamUser> listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5);
+ List<ShamUser> listShareUser = new ArrayList<ShamUser>();
+ if (tb.getBiz30day() >= 1000) {
+ listShareUser = shamUserService.listRandShareUser(10, shareMoney, 1, 5);
+ }
// 鍒ゆ柇鏀惰棌
if (StringUtil.isNullOrEmpty(uid)) {
@@ -1909,7 +1914,7 @@
goods.put("coupon", StringUtil.isNullOrEmpty(tb.getCouponInfo()) ? false : true);
// 棰嗗埜浜哄垪琛�
- List<ShamUser> listCouponUser = null;
+ List<ShamUser> listCouponUser = new ArrayList<ShamUser>();
// 鑾峰彇鍒镐俊鎭�
if (!StringUtil.isNullOrEmpty(tb.getCouponInfo())) {
@@ -1930,8 +1935,10 @@
+ tb.getCouponEffectiveEndTime().replace("-", "."));
goods.put("couponInfo", couponInfo);
- // 棰嗗埜浜哄垪琛�
- listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+ if (tb.getBiz30day() >= 1000) {
+ // 棰嗗埜浜哄垪琛�
+ listCouponUser = shamUserService.listRandCouponUser(5, 1, 300);
+ }
}
data.put("tbPidInfo", clientTBPid);
--
Gitblit v1.8.0