资金统计

yujian

2020-04-14 88e7382670bf6c88e5e550f92e36307643cb5d5a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java

@@ -188,10 +188,9 @@


      // 上月提现

      typeList.clear();



      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      long timeStamp = System.currentTimeMillis();

      Calendar calendar = Calendar.getInstance();

      calendar.setTimeInMillis(timeStamp);

@@ -200,9 +199,24 @@
      calendar.add(Calendar.MONTH, -1);

      minDate = new Date(TimeUtil

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



      vo.setLastMonthExtractMoney(

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

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate, 1).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);

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      vo.setMonthExtractMoney(

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

		
		
      if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

      // 上月收入

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

@@ -224,19 +238,7 @@


      vo.setLatestThreeMonthRecievedMoney(

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

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);



      vo.setMonthExtractMoney(

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

      // 本月到账

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

@@ -249,42 +251,9 @@
      typeList.add(UserMoneyDetailTypeEnum.weiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbao);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);



      vo.setMonthRecievedMoney(

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

      // 总的邀请赚

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);



      minDate = new Date(0L);

      maxDate = new Date(timeStamp);

      vo.setTotalInviteMoney(

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

      // 总的到账



      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

      typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

      typeList.add(UserMoneyDetailTypeEnum.weiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbao);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

      vo.setTotalRecievedMoney(

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

      // 总的分享赚



      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);



      vo.setTotalShareMoney(

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



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

      Calendar ca = Calendar.getInstance();

@@ -292,7 +261,6 @@
      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);

@@ -301,6 +269,68 @@
      minDate = new Date(0);

      maxDate = new Date(timeStamp);

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

			
         // 总的到账

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.orderReward);

         typeList.add(UserMoneyDetailTypeEnum.share);

         typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.invite);

         typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

         typeList.add(UserMoneyDetailTypeEnum.weiQuan);

         typeList.add(UserMoneyDetailTypeEnum.hongbao);

         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

         typeList.add(UserMoneyDetailTypeEnum.subsidy);

         typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);

         vo.setTotalRecievedMoney(

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

      }

		
      minDate = new Date(0L);

      maxDate = new Date(timeStamp);

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

         // 总的自购返利

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.orderReward);

         vo.setTotalFanLiMoney(

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

			
         // 累计成功提现

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.extract);

         typeList.add(UserMoneyDetailTypeEnum.extractVerify);

         typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);

         typeList.add(UserMoneyDetailTypeEnum.extractReject);

         vo.setTotalExtractMoney(

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

      }

		
      // 总的分享赚

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      vo.setTotalShareMoney(

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

		
      // 总的邀请赚

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

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

         typeList.add(UserMoneyDetailTypeEnum.subsidy);

         typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);

      }

      vo.setTotalInviteMoney(

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

		
					
      GsonBuilder builder = new GsonBuilder();

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

         @Override

@@ -315,11 +345,12 @@
         }

      });



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

         // 获取提现中的信息

         BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

         if (extractingMoney.compareTo(new BigDecimal(0)) > 0)

            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2, RoundingMode.HALF_UP));

		
      if (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion()) && !VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {

         // 获取是否绑定了微信

         if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {

            vo.setBindingWX(true);