From b3007afcb9b8ca4302497a2c1c3e0d990b10a388 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 14:52:40 +0800
Subject: [PATCH] 新版订单与返利
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
index b3ee92e..ff21d13 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java
@@ -14,12 +14,16 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.admin.InviteGetMoney;
+import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.exception.NotExistObjectException;
+import com.yeshi.fanli.exception.banner.SwiperPictureException;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.InviteGetMoneyService;
import com.yeshi.fanli.service.inter.config.SystemClientParamsService;
import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
+import com.yeshi.fanli.service.inter.homemodule.SwiperPictureService;
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
@@ -59,6 +63,12 @@
@Resource
private UserRankingsService userRankingsService;
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private SwiperPictureService swiperPictureService;
+
@RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST)
public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid)
throws NotExistObjectException {
@@ -83,10 +93,11 @@
List<InviteGetMoney> inviteGetMoneyList = userRankingsService.getRank(0, 5);
- JSONObject data = new JSONObject();
+ com.alibaba.fastjson.JSONObject data = new com.alibaba.fastjson.JSONObject();
data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity));
data.put("everyDayTaskList", new JSONArray());
- data.put("inviteGetMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList));
+ data.put("inviteGetMoneyList",
+ JSONArray.fromObject(JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList)));
if (uid.equals("0") || uid == null) {
data.put("myTeam", "---");
data.put("moneyToday", "---");
@@ -129,7 +140,26 @@
data.put("activityRules", valueBr);
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
- out.print(JsonUtil.loadTrue(0, JsonUtil.getSimpleGson().toJson(data), "鎴愬姛"));
+ try {
+ List<SwiperPicture> pictureList = swiperPictureService.getByBannerCard("invite_top_banner");
+ if (pictureList != null && pictureList.size() > 0) {
+ SwiperPicture picture = pictureList.get(0);
+ com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
+ pictureJson.put("src", picture.getSrc());
+ pictureJson.put("jumpDetail", picture.getJumpDetail());
+ pictureJson.put("params", picture.getParams());
+ data.put("topBanner", pictureJson);
+ }
+
+ } catch (SwiperPictureException e) {
+ e.printStackTrace();
+ }
+
+ com.alibaba.fastjson.JSONObject root = new com.alibaba.fastjson.JSONObject();
+ root.put("code", 0);
+ root.put("data", data);
+
+ out.print(JsonUtil.loadTrue(0, root, "鎴愬姛"));
}
/**
--
Gitblit v1.8.0