From 073d2e0dd261bae87d8f26092988dc176c940eaa Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 26 二月 2019 19:01:29 +0800
Subject: [PATCH] 券相关的通知消息
---
fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 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..55654a9 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;
@@ -101,6 +102,7 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserCustomSettingsService;
import com.yeshi.fanli.service.inter.user.UserGoodsStorageService;
+import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.RedisManager;
@@ -229,6 +231,12 @@
@Resource
private UserCustomSettingsService userCustomSettingsService;
+
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
+
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
@RequestMapping(value = "getrecommendsection")
public void getRecommendSection(AcceptData acceptData, int index, PrintWriter out) {
@@ -2042,6 +2050,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;
@@ -2200,4 +2218,58 @@
out.print(JsonUtil.loadTrueResult(data));
}
+ /**
+ * 娲诲姩鍒楄〃
+ *
+ * @param acceptData
+ * @param out
+ */
+ @RequestMapping(value = "getSpecialActivities")
+ public void getSpecialActivities(AcceptData acceptData, PrintWriter out) {
+
+ System system = systemService.getSystemCache(acceptData.getPlatform(), acceptData.getPackages());
+ if (system == null) {
+ out.print(JsonUtil.loadFalseResult(1, "绯荤粺涓嶅瓨鍦�"));
+ return;
+ }
+
+ try {
+ // 涓撻娲诲姩
+ String specialCard = "special_activities";
+
+ List<Special> listSpecial = specialService.listPageBySystemAndCard(0, Integer.MAX_VALUE, specialCard,
+ system.getId());
+
+ if (listSpecial != null && listSpecial.size() > 0) {
+ for (Special special : listSpecial) {
+ special.setCreatetime(null);
+ special.setUpdatetime(null);
+ special.setState(null);
+ special.setRemark(null);
+ special.setCard(null);
+ special.setCardId(null);
+
+ // 鎵嬪姩鏇挎崲鍙傛暟
+ if (special.getName() != null && special.getName().contains("閭�璇�")) {
+// userInfoExtraService
+
+ }
+
+ JumpDetailV2 jumpDetail = special.getJumpDetail();
+ if (jumpDetail != null) {
+ jumpDetail.setId(null);
+ jumpDetail.setName(null);
+ }
+
+ }
+ }
+
+ JSONObject root = new JSONObject();
+ root.put("special", listSpecial);
+
+ out.print(JsonUtil.loadTrueResult(root));
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.8.0