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

yujian

2020-05-26 022c492fe0645af7761889f6471e3e2ae5751fb6

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

@@ -104,7 +104,6 @@
   @Resource

   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;

   



   private Gson getGson() {

      GsonBuilder builder = new GsonBuilder();

      builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {

@@ -155,7 +154,6 @@
      Gson gson = getGson();

      out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));

   }

	
   

   public MoneyStatisticVO createMoneyStatistic(Long uid) {

      UserInfo user = userInfoService.getUserById(uid);

@@ -274,8 +272,6 @@
      return vo;

   }

   

	


   @RequestMapping(value = "getUserMoneyInfo")

   public void getUserMoneyInfo(AcceptData acceptData, Long uid, PrintWriter out) {

      if (uid == null || uid == 0) {

@@ -308,6 +304,10 @@
               predictVO.setMineNum(predictVO.getMineNum() + dailyCount.getOrderNum());

            if (dailyCount.getOrderNumTeam() != null)

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



            if (dailyCount.getTeamDividentsOrderNum() != null)

               predictVO.setTotalNum(predictVO.getTotalNum() + dailyCount.getTeamDividentsOrderNum());



            if (dailyCount.getIncome() != null)

               predictVO.setMineMoney(predictVO.getMineMoney()

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

@@ -316,7 +316,7 @@
                     .add(MoneyBigDecimalUtil.div(BigDecimal.valueOf(dailyCount.getIncomeTeam()), hundred)));

         }

      }

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

      predictVO.setTotalNum(predictVO.getTotalNum());

      predictVO.setTotalMoney(predictVO.getMineMoney().add(predictVO.getTeamMoney()));

      return predictVO;

   }

@@ -339,7 +339,8 @@
      String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.extractRecord);

      if (!StringUtil.isNullOrEmpty(redisContent)) {

         Gson gson = new Gson();

         list = gson.fromJson(redisContent, new TypeToken<ArrayList<Extract>>() {}.getType());

         list = gson.fromJson(redisContent, new TypeToken<ArrayList<Extract>>() {

         }.getType());

      }

      

      // 查询真实

@@ -605,7 +606,7 @@
   }



   private TeamPredictVO crateTeamPredictVO(List<OrderMoneyDailyCount> list) {

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

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

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

         BigDecimal hundred = BigDecimal.valueOf(100);

         for (OrderMoneyDailyCount dailyCount : list) {

@@ -620,9 +621,12 @@
               predictVO.setSubsidy(predictVO.getSubsidy()

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



            if (dailyCount.getTeamDividentsOrderNum() != null)

               predictVO.setTotalNum(predictVO.getTotalNum() + dailyCount.getTeamDividentsOrderNum());



         }

      }

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

      predictVO.setTotalNum(predictVO.getTotalNum());

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

      return predictVO;

   }

@@ -661,7 +665,7 @@
            int countNum = 7;

            Date day = TimeUtil.parseYYYYMMDD(date);

            for (int i = 0; i < countNum; i++) {

               TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0);

               TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0, 0);

               if (i == 0) {

                  predictVO.setCountDate(formatDay.format(day));

               } else {

@@ -680,7 +684,7 @@
            int countNum = 3;

            Date day = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));

            for (int i = 0; i < countNum; i++) {

               TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0);

               TeamPredictVO predictVO = new TeamPredictVO(zero, 0, zero, 0, 0);

               if (i == 0) {

                  predictVO.setCountDate(formatMonth.format(day));

               } else {

@@ -710,6 +714,7 @@
                     predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());

                     predictVO.setSubsidy(

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

                     predictVO.setTotalNum(dailyCount.getTeamDividentsOrderNum());

                     break;

                  }



@@ -722,12 +727,14 @@
                     predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());

                     predictVO.setSubsidy(

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



                     predictVO.setTotalNum(dailyCount.getTeamDividentsOrderNum());

                     break;

                  }

               }

            }



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

            predictVO.setTotalNum(predictVO.getTotalNum());

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

         }



@@ -744,8 +751,6 @@
      }

   }



	
	
   /**

    *  分红详情

    * 

@@ -755,8 +760,8 @@
    * @param out

    */

   @RequestMapping(value = "getTeamDividendDetail")

   public void getTeamDividendDetail(String callback, AcceptData acceptData, Integer page, Long uid, 
         String date, Integer datetype, String key, PrintWriter out) {

   public void getTeamDividendDetail(String callback, AcceptData acceptData, Integer page, Long uid, String date,

         Integer datetype, String key, PrintWriter out) {

      if (uid == null || uid == 0) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("用户未登录"));

         return;

@@ -771,7 +776,6 @@
         page = 1;

      int pageSize = Constant.PAGE_SIZE;

      



      try {

         Date minDay = new Date();

         Date maxDay = new Date();

@@ -782,7 +786,8 @@
            minDay = TimeUtil.parseYYYYMMDD(DateUtil.getFirstDayOfMonth(date));

            maxDay = TimeUtil.parseYYYYMMDD_HHMMSS(DateUtil.getLastDayOfMonth(date) + " 23:59:59");

         }

         List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService.listByDateAndTargetUid((page-1) * pageSize, pageSize, uid, minDay, maxDay, key);

         List<TeamDividentsVO> list = teamDividentsSourceOrderUserMapService

               .listByDateAndTargetUid((page - 1) * pageSize, pageSize, uid, minDay, maxDay, key);

         if (list == null) {

            list = new ArrayList<>();

         }

@@ -806,7 +811,8 @@
         JSONObject object = new JSONObject();



         if (page == 1) {

            TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid, minDay, maxDay, key);

            TeamDividentsVO teamDividentsVO = teamDividentsSourceOrderUserMapService.sumByDateAndTargetUid(uid,

                  minDay, maxDay, key);

            if (teamDividentsVO == null) {

               teamDividentsVO = new TeamDividentsVO();

               teamDividentsVO.setSubsidy(BigDecimal.ZERO);

@@ -825,7 +831,6 @@
         LogHelper.errorDetailInfo(e);

      }

   }



   

   /**

    * 订单统计-h5

@@ -848,24 +853,28 @@
         // 今日预估

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

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

         OrderMoneyDailyCount todayRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, null));

         OrderMoneyDailyCount todayRecord = createVO(

               orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, null));



         // 昨日预估

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

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

         minDate = DateUtil.reduceDay(1, maxDate);

         OrderMoneyDailyCount yesterdayRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, maxDate));

         OrderMoneyDailyCount yesterdayRecord = createVO(

               orderMoneyDailyCountService.sumTeamOrderNumGroupByCountDay(uid, minDate, maxDate));



         // 本月预估

         maxDate = new Date(timeStamp);

         calendar = Calendar.getInstance();

         minDate = new Date(TimeUtil

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

         minDate = new Date(TimeUtil.convertToTimeTemp(

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

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

         OrderMoneyDailyCount monthRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByYearMonth(uid, minDate, maxDate));

         OrderMoneyDailyCount monthRecord = createVO(

               orderMoneyDailyCountService.sumTeamOrderNumGroupByYearMonth(uid, minDate, maxDate));

         

         // 累计

         OrderMoneyDailyCount totalityRecord = createVO(orderMoneyDailyCountService.sumTeamOrderNumGroupByUid(uid, null, null));

         OrderMoneyDailyCount totalityRecord = createVO(

               orderMoneyDailyCountService.sumTeamOrderNumGroupByUid(uid, null, null));

         

         JSONObject today = new JSONObject();

         today.put("direct", todayRecord.getDirectOrderNum());

@@ -887,7 +896,6 @@
         totality.put("indirect", totalityRecord.getInDirectOrderNum());

         totality.put("beyond", totalityRecord.getBeyondOrderNum());

         

			
         JSONObject json = new JSONObject();

         json.put("today", today);

         json.put("yesterday", yesterday);

@@ -901,7 +909,6 @@
      }

   }

   

	
   private OrderMoneyDailyCount createVO(List<OrderMoneyDailyCount> list) {

      OrderMoneyDailyCount totalityRecord = new OrderMoneyDailyCount(0,0,0);

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

@@ -913,8 +920,6 @@
      }  

      return totalityRecord;

   }

	
	
   

   /**

    * 订单排行榜

@@ -952,8 +957,8 @@
            // 本月

            maxDate = new Date(timeStamp);

            calendar = Calendar.getInstance();

            minDate = new Date(TimeUtil

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

            minDate = new Date(TimeUtil.convertToTimeTemp(

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

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

         }