智能推荐跳转

admin

2020-06-29 1ada7e4868d4821980f674017adbffd67c14402a

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

@@ -32,7 +32,7 @@
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.order.SourceTypeEnum;

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

import com.yeshi.fanli.log.LogHelper;

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

@@ -50,6 +50,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.vo.money.IncomeDetailVO;

import com.yeshi.fanli.vo.money.MoneyPredictVO;

@@ -97,13 +98,12 @@


   @Resource

   private TeamEincomeRecordService teamEincomeRecordService;

	


   @Resource

   private PreviewInfoService previewInfoService;

	


   @Resource

   private TeamDividentsSourceOrderUserMapService teamDividentsSourceOrderUserMapService;

	


   private Gson getGson() {

      GsonBuilder builder = new GsonBuilder();

@@ -114,7 +114,7 @@
               return new JsonPrimitive("");

            } else {

               // 保留2位小数

               value = value.setScale(2);

               value = value.setScale(2, BigDecimal.ROUND_DOWN);

               return new JsonPrimitive(value.toString());

            }

         }

@@ -135,7 +135,7 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

		


      // VIP数据预览

      MoneyStatisticVO vo = null;

      String redisContent = previewInfoService.getRedisContent(uid, PreviewEnum.moneyInfo);

@@ -144,27 +144,37 @@
         if (vo != null) {

            vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));

            vo.setExtractDesc("提现金额就是已成功提现到支付宝的资金");

            vo.setMoneyArrivalDesc("订单已到账后提现时间和金额均不受限制");

            if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

               vo.setMoneyArrivalDesc("尽早确认收货可以促使资金尽早到账");

            } else {

               vo.setMoneyArrivalDesc("订单已到账后提现时间和金额均不受限制");

            }

				
            if(vo.getLastMonthSettleMoney() == null) {

               vo.setLastMonthExtractMoney(BigDecimal.ZERO);

            }

				
            if(vo.getNotSettleMoney() == null) {

               vo.setNotSettleMoney(BigDecimal.ZERO);

            }

         }

      }

		


      if (vo == null) {

         vo = createMoneyStatistic(uid);

         vo = createMoneyStatistic(uid, acceptData);

      }

		


      Gson gson = getGson();

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

   }

	
	
   public MoneyStatisticVO createMoneyStatistic(Long uid) {



   private MoneyStatisticVO createMoneyStatistic(Long uid, AcceptData acceptData) {

      UserInfo user = userInfoService.getUserById(uid);



      MoneyStatisticVO vo = new MoneyStatisticVO();

      vo.setLink(configService.get(ConfigKeyEnum.autoExtractHelpUrl.getKey()));

      vo.setBalanceMoney(user.getMyHongBao());

      vo.setExtractDesc("提现金额就是已成功提现到支付宝的资金");

      vo.setMoneyArrivalDesc("订单已到账后提现时间和金额均不受限制");



      // 获取提现中的信息

      BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

@@ -240,22 +250,43 @@
      vo.setTotalInviteMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());



      // 本月收货

      maxDate = new Date(timeStamp);

      calendar = Calendar.getInstance();

      minDate = new Date(TimeUtil

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

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

      vo.setMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate));

		
      if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(), acceptData.getVersion())) {

         vo.setMoneyArrivalDesc("尽早确认收货可以促使资金尽早到账");

			
         minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));

         Calendar ca = Calendar.getInstance();

         ca.setTime(new Date(timeStamp));

         ca.add(Calendar.MONTH, 1);

         maxDate = new Date(

               TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM"));

         // 本月未到账

         BigDecimal monthUnRecievedMoney = hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate);

         vo.setMonthUnRecievedMoney(monthUnRecievedMoney);

	
         // 全部未到账

         minDate = new Date(0);

         maxDate = new Date(timeStamp);

         vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));

      } else {

         vo.setMoneyArrivalDesc("订单已到账后提现时间和金额均不受限制");

         // 本月收货

         maxDate = new Date(timeStamp);

         calendar = Calendar.getInstance();

         minDate = new Date(TimeUtil

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

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

         vo.setMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate));



      // 上月收货

      maxDate = new Date(TimeUtil

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

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

      minDate = new Date(TimeUtil

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

      vo.setLastMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate));



         // 上月收货

         maxDate = new Date(TimeUtil

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

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

         minDate = new Date(TimeUtil

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

         vo.setLastMonthSettleMoney(hongBaoV2CountService.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate));

      }

		
      // 待确认收货（180天内）

      vo.setNotSettleMoney(hongBaoV2CountService.sumMoneyByANotSettleAndUid(uid));



@@ -273,8 +304,6 @@
      vo.setMonthPredict(cratePredictVO(orderMoneyDailyCountService.query(uid, minDate, maxDate)));

      return vo;

   }

	
	


   @RequestMapping(value = "getUserMoneyInfo")

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

@@ -299,6 +328,7 @@
      MoneyPredictVO predictVO = new MoneyPredictVO();

      predictVO.setMineNum(0);

      predictVO.setTeamNum(0);

      predictVO.setTotalNum(0);

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

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

      BigDecimal hundred = BigDecimal.valueOf(100);

@@ -308,6 +338,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 +350,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;

   }

@@ -335,20 +369,24 @@
         return;

      }



      long count = 0;



      List<Extract> list = null;

      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());

      }

		
      // 查询真实

      long count = 0;

      if (list == null) {



      if (list != null && list.size() > 0) {// 有预览数据

         count=list.size();

      } else {// 无预览数据

         list = extractService.getExtractSucceedRecord(page, Constant.PAGE_SIZE, uid);

         count = extractService.countExtractSucceedRecord(uid);

      }

			


      // 查询真实

      if (list == null)

         list = new ArrayList<>();



@@ -369,7 +407,7 @@
      }



      JSONObject json = new JSONObject();

      json.put("count", count == 0 ? list.size() : 0);

      json.put("count", count);

      json.put("list", JSONArray);

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

   }

@@ -484,7 +522,9 @@
         object.put("list", gson.toJson(list));

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

      } catch (ParseException e) {

         out.print(JsonUtil.loadFalseResult(1, "查询失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }



@@ -603,7 +643,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) {

@@ -618,9 +658,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;

   }

@@ -659,7 +702,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 {

@@ -678,7 +721,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 {

@@ -708,6 +751,7 @@
                     predictVO.setSubsidyNum(dailyCount.getTeamSubsidyNum());

                     predictVO.setSubsidy(

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

                     predictVO.setTotalNum(dailyCount.getTeamDividentsOrderNum());

                     break;

                  }



@@ -720,12 +764,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()));

         }



@@ -736,13 +782,12 @@
         object.put("list", gson.toJson(list));

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));

      } catch (ParseException e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("统计失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }



	
	
   /**

    *  分红详情

    * 

@@ -752,8 +797,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;

@@ -763,11 +808,10 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("参数不完整"));

         return;

      }

		


      if (page == null)

         page = 1;

      int pageSize = Constant.PAGE_SIZE;

		


      try {

         Date minDay = new Date();

@@ -779,51 +823,52 @@
            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<>();

         }

         long count = teamDividentsSourceOrderUserMapService.countByDateAndTargetUid(uid, minDay, maxDay, key);

			


         GsonBuilder builder = new GsonBuilder();

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

            @Override

            public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

               if (value == null) {

                  return new JsonPrimitive("0.000");

                  return new JsonPrimitive("0.00");

               } else {

                  // 保留2位小数

                  value = value.setScale(3);

                  // 保留3位小数

                  value = value.setScale(3, RoundingMode.DOWN);

                  return new JsonPrimitive(value.toString());

               }

            }

         });

 


         Gson gson = builder.create();

         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);

               teamDividentsVO.setDividents(BigDecimal.ZERO);

            }

            object.put("subsidy", teamDividentsVO.getSubsidy().setScale(3).toString());

            object.put("dividents", teamDividentsVO.getDividents().setScale(3).toString());

            object.put("subsidy", teamDividentsVO.getSubsidy().setScale(2, RoundingMode.DOWN).toString());

            object.put("dividents", teamDividentsVO.getDividents().setScale(2, RoundingMode.DOWN).toString());

         }

			
			


         object.put("count", count);

         object.put("list", gson.toJson(list));

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(object));

      } catch (Exception e) {

         e.printStackTrace();

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("查询失败"));

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

      }

   }



	
   /**

    * 订单统计-h5

    * 

@@ -834,57 +879,60 @@
   @RequestMapping(value = "countTeamOrderNum")

   public void countTeamOrderNum(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

      try {

			


         Date minDate = null;

         Date maxDate = null;

         long timeStamp = System.currentTimeMillis();

			


         Calendar calendar = Calendar.getInstance();

         calendar.setTimeInMillis(timeStamp);

			


         // 今日预估

         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());

         today.put("indirect", todayRecord.getInDirectOrderNum());

         today.put("beyond", todayRecord.getBeyondOrderNum());

			


         JSONObject yesterday = new JSONObject();

         yesterday.put("direct", yesterdayRecord.getDirectOrderNum());

         yesterday.put("indirect", yesterdayRecord.getInDirectOrderNum());

         yesterday.put("beyond", yesterdayRecord.getBeyondOrderNum());

			


         JSONObject month = new JSONObject();

         month.put("direct", monthRecord.getDirectOrderNum());

         month.put("indirect", monthRecord.getInDirectOrderNum());

         month.put("beyond", monthRecord.getBeyondOrderNum());

			


         JSONObject totality = new JSONObject();

         totality.put("direct", totalityRecord.getDirectOrderNum());

         totality.put("indirect", totalityRecord.getInDirectOrderNum());

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

			
			


         JSONObject json = new JSONObject();

         json.put("today", today);

         json.put("yesterday", yesterday);

@@ -897,22 +945,19 @@
         LogHelper.errorDetailInfo(e);

      }

   }

	
	


   private OrderMoneyDailyCount createVO(List<OrderMoneyDailyCount> list) {

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

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

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

         for (OrderMoneyDailyCount record: list) {

         for (OrderMoneyDailyCount record : list) {

            totalityRecord.setDirectOrderNum(totalityRecord.getDirectOrderNum() + record.getDirectOrderNum());

            totalityRecord.setInDirectOrderNum(totalityRecord.getInDirectOrderNum() + record.getInDirectOrderNum());

            totalityRecord.setBeyondOrderNum(totalityRecord.getBeyondOrderNum() + record.getBeyondOrderNum());

         }

      }  
      }

      return totalityRecord;

   }

	
	
	


   /**

    * 订单排行榜

    * @param callback

@@ -927,15 +972,15 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("参数缺失"));

         return;

      }

		


      try {

         Date minDate = null;

         Date maxDate = null;

         long timeStamp = System.currentTimeMillis();

			


         Calendar calendar = Calendar.getInstance();

         calendar.setTimeInMillis(timeStamp);

			


         if (dateType == 1) {

            // 今日

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

@@ -949,14 +994,14 @@
            // 本月

            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);

         }

			


         List<OrderRankingVO> list = orderMoneyDailyCountService.getRankingByOrderNum(uid, minDate, maxDate);

         if (list.size() > 0) {

            for (int i = 0; i < list.size(); i ++) {

            for (int i = 0; i < list.size(); i++) {

               OrderRankingVO vo = list.get(i);

               UserInfo user = userInfoService.getUserByIdWithMybatis(vo.getUid());

               if (user == null) {

@@ -968,7 +1013,7 @@
               vo.setPortrait(user.getPortrait());

            }

         }

			


         JSONObject json = new JSONObject();

         json.put("list", list);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));