yujian
2019-03-13 85696b23af4055e2e7f53b309e0cc071fe8573b4
奖金榜调整
1个文件已修改
16 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5UserRankingsController.java
@@ -18,11 +18,11 @@
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.vo.order.HongBaoV2VO;
import net.sf.json.JSONObject;
@@ -34,7 +34,7 @@
    private UserRankingsService userRankingsService;
    @Resource
    private HongBaoService hongBaoService;
    private HongBaoV2CountService hongBaoV2CountService;
    /**
     * 返利券排行榜
@@ -76,18 +76,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 ) {