Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserRankingsServiceImpl.java

@@ -16,30 +16,29 @@
import java.util.UUID;



import javax.annotation.Resource;

import javax.transaction.Transactional;



import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

import org.springframework.web.multipart.MultipartFile;

import org.yeshi.utils.tencentcloud.COSManager;



import com.yeshi.fanli.dao.mybatis.UserRankingsMapper;

import com.yeshi.fanli.entity.admin.InviteGetMoney;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.dto.money.InviteGetMoney;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserRankings;

import com.yeshi.fanli.exception.UserRankingsException;

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.StringUtil;

import org.yeshi.utils.JsonUtil;

import org.yeshi.utils.tencentcloud.COSManager;

import com.yeshi.fanli.vo.order.HongBaoV2VO;



@Service

public class UserRankingsServiceImpl implements UserRankingsService {



   @Resource

   private UserRankingsMapper userRankingsMapper;


   @Resource

   private HongBaoService hongBaoService;

   private HongBaoV2CountService hongBaoV2CountService;


   @Override

   public int insertSelective(UserRankings record) throws UserRankingsException {

@@ -369,18 +368,18 @@
         String defaultDate = sdf.format(calendar.getTime()); // 格式化前一天



         // 真实用户

         List<HongBao> listHongBao = hongBaoService.listShareAndInviteMoney(0, count, defaultDate);

         List<HongBaoV2VO> listHongBao = hongBaoV2CountService.listShareAndInviteMoney(0, count, 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) {