From a6b1160da8cbb78a664a6dd7496bee648c7c148c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 29 一月 2019 17:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 d5b107c..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) {
@@ -2042,6 +2046,16 @@
data.put("couponUsers", listCouponUser);
data.put("detailWebUrl", "http://apph5.yeshitv.com/apppage/goods_img.html?id=" + id);
+ JSONObject shareActivity = new JSONObject();
+ shareActivity.put("moneyDesc", "鏄ヨ妭鐙傛濂栭噾:楼" + TaoBaoUtil.getGoodsHongBaoMoney(tb,
+ new BigDecimal(hongBaoManageService.get("share_activity_proportion"))));
+ shareActivity.put("ruleDescPicture", "http://img.flqapp.com/resource/share_activity_img.png");
+
+ if (!StringUtil.isNullOrEmpty(uid)
+ && shareGoodsActivityOrderService.countShareGoodsActivityOrder(Long.parseLong(uid)) > 0) {
+ } else
+ data.put("shareActivity", shareActivity);
+
out.print(JsonUtil.loadTrueResult(data));
final String tempUid = uid;
--
Gitblit v1.8.0