From 735883f04e0be2a5c0235b5fb5fd388192ab8330 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 18 十二月 2018 14:40:25 +0800
Subject: [PATCH] 邀请有奖代码恢复 用户登录BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/client/InviteGetMoneyController.java | 78 +++++++++++++++++++++++++++++++++++++++
1 files changed, 78 insertions(+), 0 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 25fc6be..7bdf939 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
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.io.PrintWriter;
+import java.math.BigDecimal;
import java.util.List;
import javax.annotation.Resource;
@@ -12,6 +13,7 @@
import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.entity.accept.AcceptData;
+import com.yeshi.fanli.entity.admin.InviteGetMoney;
import com.yeshi.fanli.entity.system.System;
import com.yeshi.fanli.entity.system.SystemClientParams;
import com.yeshi.fanli.exception.NotExistObjectException;
@@ -21,7 +23,10 @@
import com.yeshi.fanli.service.inter.user.QrCodeService;
import com.yeshi.fanli.service.inter.user.SpreadUserImgService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
+import com.yeshi.fanli.tag.PageEntity;
+import com.yeshi.fanli.util.Constant;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
/**
@@ -54,6 +59,79 @@
@Resource
private UserRankingsService userRankingsService;
+ @RequestMapping(value = "/inviteGetMoney", method = RequestMethod.POST)
+ public void everyDayTaskList(AcceptData acceptData, int pageIndex, PrintWriter out, String uid)
+ throws NotExistObjectException {
+ // 鏌ヨ鍟嗗搧鎬绘暟
+ Integer totalCount = 0;
+ int totalPage = totalCount % Constant.PAGE_SIZE == 0 ? totalCount / Constant.PAGE_SIZE
+ : totalCount / Constant.PAGE_SIZE + 1;
+ PageEntity pageEntity = new PageEntity(pageIndex, Constant.PAGE_SIZE, totalCount, totalPage);
+
+ /*
+ * // 鍒嗛〉鏌ヨ閭�璇锋彁鎴愭 List<InviteGetMoney> inviteGetMoneyList =
+ * inviteGetMoneyService.inviteGetMoneyList(pageIndex - 1, "");
+ *
+ * // 鍚嶅瓧*澶勭悊 for (InviteGetMoney inviteGetMoney : inviteGetMoneyList) {
+ *
+ * String name = inviteGetMoney.getName(); if (name != null) { if
+ * (name.length() > 2) { name = Utils.getStarString(name, 1,
+ * name.length() - 1); } else { name = name.substring(0, 1) + "**" +
+ * name.substring(name.length() - 1); } } inviteGetMoney.setName(name);
+ * inviteGetMoney.setRankIcon(UserUtil.getRankIcon(3)); }
+ */
+
+ List<InviteGetMoney> inviteGetMoneyList = userRankingsService.getRank(0, 5);
+
+ JSONObject data = new JSONObject();
+ data.put("pageEntity", JsonUtil.getSimpleGsonWithDate().toJson(pageEntity));
+ data.put("everyDayTaskList", new JSONArray());
+ data.put("inviteGetMoneyList", JsonUtil.getSimpleGsonWithDate().toJson(inviteGetMoneyList));
+ if (uid.equals("0") || uid == null) {
+ data.put("myTeam", "---");
+ data.put("moneyToday", "---");
+ data.put("moneyMonth", "---");
+ data.put("moneyLastMonth", "---");
+ } else {
+ // 鎴戠殑闃熷憳
+ int myFirstTeamCount = inviteGetMoneyService.myFirstTeamCount(uid);
+ int mySecondTeamCount = inviteGetMoneyService.mySecondTeamCount(uid);
+ int myTeamCount = myFirstTeamCount + mySecondTeamCount;
+ data.put("myTeam", myTeamCount);
+ // 浠婃棩 鏈湀棰勪及鏀剁泭
+ BigDecimal moneyToday = inviteGetMoneyService.getMoneyToday(uid + "");
+ if (moneyToday == null) {
+ moneyToday = new BigDecimal(0);
+ }
+ BigDecimal moneyMonth = inviteGetMoneyService.getMoneyMonth(uid + "");
+ if (moneyMonth == null) {
+ moneyMonth = new BigDecimal(0);
+ }
+
+ BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + "");
+
+ data.put("moneyToday", moneyToday.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("moneyMonth", moneyMonth.setScale(2, BigDecimal.ROUND_DOWN));
+ data.put("moneyLastMonth", moneyLastMonth);
+ }
+
+ // 娲诲姩瑙勫垯
+ String key = "activityRules"; // key鍊�
+ com.yeshi.fanli.entity.system.System system = new System();
+ system.setCreatetime(java.lang.System.currentTimeMillis());
+ system.setPlatform(1);
+ system.setId(4L);
+ SystemClientParams values = systemClientParamsService.getSystemClientParamsBySystemAndKey(system, key);
+ // 杞崲鎹㈣绗� 缁欏墠绔�
+ String valueN = values.getValue();
+ String valueBr = valueN.replace("\n", "<br><br>");
+
+ 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), "鎴愬姛"));
+ }
+
/**
*
* 鏂规硶璇存槑: 鍒嗕韩濂藉弸閭�璇峰浘鐗�
--
Gitblit v1.8.0