Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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;// 奖金

}