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

admin

2020-05-14 235921d820f29b04b1e82f6a6f0d4a1957a900ef

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserMoneyControllerV2.java

@@ -27,12 +27,14 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

import com.yeshi.fanli.entity.money.TeamEincomeRecord;

import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.entity.order.OrderMoneyDailyCount;

import com.yeshi.fanli.entity.order.OrderMoneyDailyCount.SourceTypeEnum;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

import com.yeshi.fanli.service.inter.money.TeamEincomeRecordService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

import com.yeshi.fanli.service.inter.order.HongBaoV2Service;

@@ -40,6 +42,7 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.account.UserUtil;

@@ -84,6 +87,9 @@


   @Resource

   private OrderMoneyDailyCountService orderMoneyDailyCountService;

	
   @Resource

   private TeamEincomeRecordService teamEincomeRecordService;



   

   private Gson getGson() {

@@ -243,7 +249,7 @@
      predictVO.setTeamNum(0);

      predictVO.setMineMoney(BigDecimal.valueOf(0));

      predictVO.setTeamMoney(BigDecimal.valueOf(0));



      BigDecimal hundred = BigDecimal.valueOf(100);

      if (list != null && list.size() > 0) {

         for (OrderMoneyDailyCount dailyCount : list) {

            if (dailyCount.getOrderNum() != null)

@@ -251,9 +257,9 @@
            if (dailyCount.getOrderNumTeam() != null)

               predictVO.setTeamNum(predictVO.getTeamNum() + dailyCount.getOrderNumTeam());

            if (dailyCount.getIncome() != null)

               predictVO.setMineMoney(predictVO.getMineMoney().add(BigDecimal.valueOf(dailyCount.getIncome()/100)));

               predictVO.setMineMoney(predictVO.getMineMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));

            if (dailyCount.getIncomeTeam() != null)

               predictVO.setTeamMoney(predictVO.getTeamMoney().add(BigDecimal.valueOf(dailyCount.getIncomeTeam()/100)));

               predictVO.setTeamMoney(predictVO.getTeamMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred)));

         }

      }

      predictVO.setTotalNum(predictVO.getTeamNum() + predictVO.getMineNum());

@@ -372,6 +378,7 @@
            listDailyCount = orderMoneyDailyCountService.sumGroupByYearMonth(uid, minDay, maxDay);

         }



         BigDecimal hundred = BigDecimal.valueOf(100);

         for (MoneyPredictVO predictVO : list) {

            String countDate = predictVO.getCountDate();



@@ -380,9 +387,9 @@
                  Date countDay = dailyCount.getCountDay();

                  if (datetype == 1 && countDay != null && countDate.equals(formatDay.format(countDay))) {

                     predictVO.setMineNum(dailyCount.getOrderNum());

                     predictVO.setMineMoney(BigDecimal.valueOf(dailyCount.getIncome()/100));

                     predictVO.setMineMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));

                     predictVO.setTeamNum(dailyCount.getOrderNumTeam());

                     predictVO.setTeamMoney(BigDecimal.valueOf(dailyCount.getIncomeTeam()/100));

                     predictVO.setTeamMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));

                     break;

                  }



@@ -390,9 +397,9 @@
                  if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth)

                        && countDate.equals(formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {

                     predictVO.setMineNum(dailyCount.getOrderNum());

                     predictVO.setMineMoney(BigDecimal.valueOf(dailyCount.getIncome()/100));

                     predictVO.setMineMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred));

                     predictVO.setTeamNum(dailyCount.getOrderNumTeam());

                     predictVO.setTeamMoney(BigDecimal.valueOf(dailyCount.getIncomeTeam()/100));

                     predictVO.setTeamMoney(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred));

                     break;

                  }

               }

@@ -450,13 +457,14 @@
      List<OrderMoneyDailyCount> listDailyCount = null;

      if (type == 1) {

         listDailyCount = orderMoneyDailyCountService.sumGroupBySourceType(uid, minDay, maxDay);

      } else if (type == 1) {

      } else if (type == 2) {

         listDailyCount = orderMoneyDailyCountService.sumTeamGroupBySourceType(uid, minDay, maxDay);

      }



      BigDecimal zero = new BigDecimal(0);

      List<IncomeDetailVO> list = new ArrayList<>();



      BigDecimal hundred = BigDecimal.valueOf(100);

      SourceTypeEnum[] arrayEnun = SourceTypeEnum.values();

      for (int m = 0; m < arrayEnun.length; m++) {

         SourceTypeEnum typeEnum = arrayEnun[m];

@@ -465,7 +473,7 @@
            for (OrderMoneyDailyCount dailyCount : listDailyCount) {

               if (dailyCount.getSourceType() == typeEnum) {

                  detail.setNum(detail.getNum() + dailyCount.getOrderNum());

                  detail.setMoney(detail.getMoney().add(BigDecimal.valueOf(dailyCount.getIncome()/100)));

                  detail.setMoney(detail.getMoney().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncome()), hundred)));

               }

            }

         }

@@ -503,7 +511,7 @@
      // 今日预估

      calendar.add(Calendar.DAY_OF_YEAR, -1);

      minDate = new Date(TimeUtil.convertDateToTemp(TimeUtil.getGernalTime(timeStamp)));

      MoneyPredictVO todayVO = cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, null));

      TeamPredictVO todayVO = crateTeamPredictVO(orderMoneyDailyCountService.query(uid, minDate, null));



      // 本月预估

      maxDate = new Date(timeStamp);

@@ -511,20 +519,45 @@
      minDate = new Date(TimeUtil

            .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

      calendar.add(Calendar.MONTH, -1);

      MoneyPredictVO monthVO = cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate));

      TeamPredictVO monthVO = crateTeamPredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate));



      // 统计已到账分红、补贴

      BigDecimal subsidy = teamEincomeRecordService.sumRecieveByType(uid, TeamEincomeRecord.TYPE_TEAM_SUBSIDY);

      BigDecimal reward = teamEincomeRecordService.sumRecieveByType(uid, TeamEincomeRecord.TYPE_TEAM_DIVIDENTS);





      Gson gson = getGson();

      JSONObject object = new JSONObject();

      object.put("total", "0.00"); //TODO

      object.put("reward", "0.00");

      object.put("subsidy", "0.00");

      object.put("total", subsidy.add(reward).setScale(2).toString());

      object.put("reward", reward.setScale(2).toString());

      object.put("subsidy", subsidy.setScale(2).toString());

      object.put("today", gson.toJson(todayVO));

      object.put("month", gson.toJson(monthVO));

      out.print(JsonUtil.loadTrueResult(object));

   }

   

   

   private TeamPredictVO crateTeamPredictVO(List<OrderMoneyDailyCount> list) {

      TeamPredictVO predictVO = new TeamPredictVO(BigDecimal.ZERO,0,BigDecimal.ZERO,0);

      if (list != null && list.size() > 0) {

         BigDecimal hundred = BigDecimal.valueOf(100);

         for (OrderMoneyDailyCount dailyCount : list) {

            if (dailyCount.getTeamRewardNum() != null)

               predictVO.setRewardNum(predictVO.getRewardNum() + dailyCount.getTeamRewardNum());

            if (dailyCount.getTeamSubsidyNum() != null)

               predictVO.setSubsidyNum(predictVO.getSubsidyNum() + dailyCount.getTeamSubsidyNum());

            if (dailyCount.getTeamReward() != null)

               predictVO.setReward(predictVO.getReward().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred)));

            if (dailyCount.getTeamSubsidy() != null)

               predictVO.setSubsidy(predictVO.getSubsidy().add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred)));

   

				
         }

      }

      predictVO.setTotalNum(predictVO.getRewardNum() + predictVO.getSubsidyNum());

      predictVO.setTotalMoney(predictVO.getReward().add(predictVO.getSubsidy()));

      return predictVO;

   }

   

   

   

@@ -596,6 +629,7 @@
            listDailyCount = orderMoneyDailyCountService.sumTeamGroupByYearMonth(uid, minDay, maxDay);

         }



         BigDecimal hundred = BigDecimal.valueOf(100);

         for (TeamPredictVO predictVO : list) {

            String countDate = predictVO.getCountDate();



@@ -604,9 +638,9 @@
                  Date countDay = dailyCount.getCountDay();

                  if (datetype == 1 && countDay != null && countDate.equals(formatDay.format(countDay))) {

                     predictVO.setRewardNum(dailyCount.getTeamRewardNum());

                     predictVO.setReward(BigDecimal.valueOf(dailyCount.getTeamReward()/100));

                     predictVO.setReward(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));

                     predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());

                     predictVO.setSubsidy(BigDecimal.valueOf(dailyCount.getTeamSubsidy()/100));

                     predictVO.setSubsidy(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));

                     break;

                  }



@@ -614,9 +648,9 @@
                  if (datetype == 2 && !StringUtil.isNullOrEmpty(yearMonth)

                        && countDate.equals(formatMonth.format(TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(yearMonth))))) {

                     predictVO.setRewardNum(dailyCount.getTeamRewardNum());

                     predictVO.setReward(BigDecimal.valueOf(dailyCount.getTeamReward()/100));

                     predictVO.setReward(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamReward()), hundred));

                     predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());

                     predictVO.setSubsidy(BigDecimal.valueOf(dailyCount.getTeamSubsidy()/100));

                     predictVO.setSubsidy(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getTeamSubsidy()), hundred));

                     break;

                  }

               }

@@ -636,7 +670,6 @@
         e.printStackTrace();

      }

   }

	
   



}