From ec8a1c6f81b5747e9efce86faaba33d10df7f61d Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期日, 01 三月 2020 16:37:26 +0800
Subject: [PATCH] 动态提示语调整
---
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java | 70 ++++++++++++++++------------------
1 files changed, 33 insertions(+), 37 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
index 97fc634..237c4f5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
@@ -2,6 +2,7 @@
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
@@ -11,20 +12,19 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
-import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserRankings;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.user.UserRankingsService;
-import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
-import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.vo.order.HongBaoV2VO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/apph5/v1/rewardRank")
@@ -32,16 +32,15 @@
@Resource
private UserRankingsService userRankingsService;
-
+
@Resource
- private HongBaoService hongBaoService;
-
+ private HongBaoV2CountService hongBaoV2CountService;
/**
- * 杩斿埄鍒告帓琛屾
+ * 鏉挎牀蹇渷鎺掕姒�
* @param callback
* @param out
*/
- @RequestNoSignValidate()
+ //@RequestNoSignValidate()
@RequestMapping(value = "getRank")
public void getRank(String callback, PrintWriter out) {
@@ -54,6 +53,8 @@
return;
}
+ DecimalFormat format = new DecimalFormat("0.00");
+
List<RankInfo> rankingsList = new ArrayList<RankInfo>();
for (UserRankings userRankings: userRankingsList) {
@@ -61,7 +62,9 @@
rankInfo.nickName = userRankings.getNickName();
rankInfo.portrait = userRankings.getPortrait();
rankInfo.showId = userRankings.getShowId();
- rankInfo.reward = userRankings.getTradeReward();
+
+ rankInfo.reward = format.format(userRankings.getTradeReward());
+
rankingsList.add(rankInfo);
}
@@ -72,18 +75,18 @@
String defaultDate = sdf.format(calendar.getTime()); //鏍煎紡鍖栧墠涓�澶�
// 鐪熷疄鐢ㄦ埛
- List<HongBao> listHongBao = hongBaoService.listShareAndInviteMoney(0, 50, defaultDate);
+ List<HongBaoV2VO> listHongBao = hongBaoV2CountService.listShareAndInviteMoney(0, 50, defaultDate);
if (listHongBao != null && listHongBao.size() > 0) {
- HongBao hongBao = listHongBao.get(0);
- BigDecimal maxMoney = hongBao.getShareAndInviteMoney();
+ HongBaoV2VO hongBao = listHongBao.get(0);
+ BigDecimal maxMoney = hongBao.getTotalMoney();
UserRankings userRankings = userRankingsList.get(userRankingsList.size()-1);
BigDecimal mminMoney = userRankings.getTradeReward();
// 鐪熷疄鏁版嵁澶т簬鏈�浣庨噾棰�
if (maxMoney.compareTo(mminMoney) > 0 ) {
- for (HongBao hb: listHongBao) {
- BigDecimal rewardMoney = hb.getShareAndInviteMoney();
+ for (HongBaoV2VO hb: listHongBao) {
+ BigDecimal rewardMoney = hb.getTotalMoney();
// 濂栭噾楂樺埌浣庢帓搴忥紝涓嶆弧瓒崇粨鏉熷惊鐜�
if (rewardMoney.compareTo(mminMoney) <= 0 ) {
@@ -94,7 +97,8 @@
if (userInfo != null) {
RankInfo rankInfo = new RankInfo();
- rankInfo.reward = rewardMoney;
+
+ rankInfo.reward = format.format(rewardMoney);
rankInfo.nickName = userInfo.getNickName();
rankInfo.portrait = userInfo.getPortrait();
rankInfo.showId = userRankings.getShowId();
@@ -143,7 +147,7 @@
* @param callback
* @param out
*/
- @RequestNoSignValidate()
+ //@RequestNoSignValidate()
@RequestMapping(value = "getTrade")
public void getTrade(String callback, PrintWriter out) {
@@ -156,6 +160,8 @@
return;
}
+ DecimalFormat format = new DecimalFormat("0.00");
+
List<RankInfo> rankingsList = new ArrayList<RankInfo>();
for (UserRankings userRankings: userRankingsList) {
@@ -163,7 +169,9 @@
rankInfo.nickName = userRankings.getNickName();
rankInfo.portrait = userRankings.getPortrait();
rankInfo.showId = userRankings.getShowId();
- rankInfo.reward = userRankings.getTradeReward();
+
+ rankInfo.reward = format.format(userRankings.getTradeReward());
+
rankingsList.add(rankInfo);
}
@@ -188,7 +196,7 @@
* @param callback
* @param out
*/
- @RequestNoSignValidate()
+ //@RequestNoSignValidate()
@RequestMapping(value = "getShare")
public void getShare(String callback, PrintWriter out) {
@@ -201,6 +209,8 @@
return;
}
+ DecimalFormat format = new DecimalFormat("0.00");
+
List<RankInfo> rankingsList = new ArrayList<RankInfo>();
for (UserRankings userRankings: userRankingsList) {
@@ -208,7 +218,7 @@
rankInfo.nickName = userRankings.getNickName();
rankInfo.portrait = userRankings.getPortrait();
rankInfo.showId = userRankings.getShowId();
- rankInfo.reward = userRankings.getShareReward();
+ rankInfo.reward = format.format(userRankings.getShareReward());
rankingsList.add(rankInfo);
}
@@ -227,20 +237,6 @@
}
}
- public static void main(String[] args) {
-// Calendar calendar = Calendar.getInstance();
-// calendar.setTime(new Date());//鎶婂綋鍓嶆椂闂磋祴缁欐棩鍘�
-// calendar.add(Calendar.DAY_OF_MONTH, -1); //璁剧疆涓哄墠涓�澶�
-//
-// SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd"); //璁剧疆鏃堕棿鏍煎紡
-// String defaultStartDate = sdf.format(calendar.getTime()); //鏍煎紡鍖栧墠涓�澶�
-// System.out.println(defaultStartDate);
-//
- String uid = "12364";
- String index = uid.substring(0, 1);
- String end = uid.substring(uid.length()-1, uid.length());
- System.out.println(index+ "***" + end);
- }
public List<RankInfo> listSort (List<RankInfo> list) {
@@ -269,5 +265,5 @@
public String nickName;// 鏄电О
public String portrait; // 澶村儚
public String showId; // 灞曠ずid
- public BigDecimal reward;// 濂栭噾
+ public String reward;// 濂栭噾
}
--
Gitblit v1.8.0