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

@@ -12,21 +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 com.yeshi.fanli.vo.order.HongBaoV2VO;



import org.yeshi.utils.JsonUtil;

import net.sf.json.JSONObject;



@Controller

@RequestMapping("api/apph5/v1/rewardRank")

@@ -34,12 +32,11 @@


   @Resource

   private UserRankingsService userRankingsService;



	
   @Resource

   private HongBaoService hongBaoService;



   private HongBaoV2CountService hongBaoV2CountService;

   /**

    * 返利券排行榜

    * 板栗快省排行榜

    * @param callback

    * @param out

    */

@@ -78,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 ) {