From ed9e2fdb519f36c743a10f0a1de48ad5f87604d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 16:05:28 +0800
Subject: [PATCH] 券状态更新

---
 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java |   49 +++++++++++++++++++++++--------------------------
 1 files changed, 23 insertions(+), 26 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..b940e95 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,10 +12,9 @@
 
 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;
@@ -23,8 +23,8 @@
 import com.yeshi.fanli.entity.bus.user.UserRankings;
 import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
 import com.yeshi.fanli.service.inter.user.UserRankingsService;
-import com.yeshi.fanli.util.annotation.RequestNoSignValidate;
-import org.yeshi.utils.JsonUtil;
+
+import net.sf.json.JSONObject;
 
 @Controller
 @RequestMapping("api/apph5/v1/rewardRank")
@@ -41,7 +41,7 @@
 	 * @param callback
 	 * @param out
 	 */
-	@RequestNoSignValidate()
+	//@RequestNoSignValidate()
 	@RequestMapping(value = "getRank")
 	public void getRank(String callback, PrintWriter out) {
 
@@ -54,6 +54,8 @@
 				return;
 			}
 			
+			DecimalFormat format = new DecimalFormat("0.00");
+			
 			List<RankInfo> rankingsList = new ArrayList<RankInfo>();
 			for (UserRankings userRankings: userRankingsList) {
 				
@@ -61,7 +63,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);
 			}
 
@@ -94,7 +98,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 +148,7 @@
 	 * @param callback
 	 * @param out
 	 */
-	@RequestNoSignValidate()
+	//@RequestNoSignValidate()
 	@RequestMapping(value = "getTrade")
 	public void getTrade(String callback, PrintWriter out) {
 
@@ -156,6 +161,8 @@
 				return;
 			}
 			
+			DecimalFormat format = new DecimalFormat("0.00");
+			
 			List<RankInfo> rankingsList = new ArrayList<RankInfo>();
 			for (UserRankings userRankings: userRankingsList) {
 				
@@ -163,7 +170,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 +197,7 @@
 	 * @param callback
 	 * @param out
 	 */
-	@RequestNoSignValidate()
+	//@RequestNoSignValidate()
 	@RequestMapping(value = "getShare")
 	public void getShare(String callback, PrintWriter out) {
 
@@ -201,6 +210,8 @@
 				return;
 			}
 			
+			DecimalFormat format = new DecimalFormat("0.00");
+			
 			List<RankInfo> rankingsList = new ArrayList<RankInfo>();
 			for (UserRankings userRankings: userRankingsList) {
 				
@@ -208,7 +219,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 +238,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 +266,5 @@
 	public String nickName;// 鏄电О
 	public String portrait; // 澶村儚
 	public String showId; // 灞曠ずid
-	public BigDecimal reward;// 濂栭噾
+	public String reward;// 濂栭噾
 }

--
Gitblit v1.8.0