From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
index 25dcd11..777c35a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/InviteGetMoneyController.java
@@ -39,6 +39,7 @@
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKey;
+import com.yeshi.fanli.vo.homemodule.BannerVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -104,8 +105,8 @@
data.put("moneyLastMonth", "---");
} else {
// 鎴戠殑闃熷憳
- long myFirstTeamCount = threeSaleSerivce.getFirstUsersCount(Long.parseLong(uid));
- long mySecondTeamCount = threeSaleSerivce.getSecondUsersCount(Long.parseLong(uid));
+ long myFirstTeamCount = threeSaleSerivce.countFirstTeam(Long.parseLong(uid));
+ long mySecondTeamCount = threeSaleSerivce.countSecondTeam(Long.parseLong(uid));
long myTeamCount = myFirstTeamCount + mySecondTeamCount;
data.put("myTeam", myTeamCount);
// 1.5.0鍚庡凡缁忎笉浣跨敤姝ゅ瓧娈�
@@ -128,10 +129,10 @@
data.put("activityRules", valueBr);
data.put("inviteList", String.format("http://%s/%s/client/share/friends_new.html",
Constant.systemCommonConfig.getProjectHost(), Constant.systemCommonConfig.getProjectName()));
- List<SwiperPicture> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",
+ List<BannerVO> pictureList = swiperPictureService.getByBannerCardAndVersion("invite_top_banner",
acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));
if (pictureList != null && pictureList.size() > 0) {
- SwiperPicture picture = pictureList.get(0);
+ BannerVO picture = pictureList.get(0);
com.alibaba.fastjson.JSONObject pictureJson = new com.alibaba.fastjson.JSONObject();
pictureJson.put("src", picture.getSrc());
pictureJson.put("jumpDetail", picture.getJumpDetail());
--
Gitblit v1.8.0