删除普通会员等级

admin

2020-04-21 0b57cfd62e842b309d03467b96a331c673ecad7c

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

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

      vo.setLastMonthExtractMoney(

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

		


      // 本月提现

      maxDate = new Date(timeStamp);

      calendar = Calendar.getInstance();

@@ -214,8 +214,7 @@
      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();

@@ -238,7 +237,7 @@


         vo.setLatestThreeMonthRecievedMoney(

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

		


         // 本月到账

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

@@ -253,8 +252,7 @@
         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

         vo.setMonthRecievedMoney(

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

		
			


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

         Calendar ca = Calendar.getInstance();

         ca.setTime(new Date(timeStamp));

@@ -264,12 +262,12 @@
         // 本月未到账

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

			


         // 总的到账

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

@@ -284,14 +282,14 @@
         typeList.add(UserMoneyDetailTypeEnum.hongbao);

         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

         typeList.add(UserMoneyDetailTypeEnum.subsidy);

         typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);

         typeList.add(UserMoneyDetailTypeEnum.teamReward);

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

@@ -300,7 +298,7 @@
         typeList.add(UserMoneyDetailTypeEnum.orderReward);

         vo.setTotalFanLiMoney(

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

			


         // 累计成功提现

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.extract);

@@ -310,14 +308,14 @@
         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);

@@ -325,12 +323,12 @@
      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

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

         typeList.add(UserMoneyDetailTypeEnum.subsidy);

         typeList.add(UserMoneyDetailTypeEnum.orderTeamDividents);

         typeList.add(UserMoneyDetailTypeEnum.teamReward);

      }

		
      vo.setTotalInviteMoney(

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

		
					


      GsonBuilder builder = new GsonBuilder();

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

         @Override

@@ -344,13 +342,14 @@
            }

         }

      });

		


      // 获取提现中的信息

      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 (VersionUtil.greaterThan_2_0(acceptData.getPlatform(), acceptData.getVersion())

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

         // 获取是否绑定了微信

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

            vo.setBindingWX(true);