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

admin

2020-04-29 a358495d588a844d9fb2e3e4a9b6c043274aac68

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

@@ -189,8 +189,11 @@
      // 上月提现

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractNew);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);

      typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);

      long timeStamp = System.currentTimeMillis();

      Calendar calendar = Calendar.getInstance();

      calendar.setTimeInMillis(timeStamp);

@@ -210,8 +213,11 @@
      calendar.add(Calendar.MONTH, -1);

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractNew);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);

      typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);

      vo.setMonthExtractMoney(

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



@@ -219,12 +225,16 @@
         // 上月收入

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliNew);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);

         typeList.add(UserMoneyDetailTypeEnum.share);

         typeList.add(UserMoneyDetailTypeEnum.shareNew);

         typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.invite);

         typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

         typeList.add(UserMoneyDetailTypeEnum.teamReward);

         typeList.add(UserMoneyDetailTypeEnum.weiQuan);

         typeList.add(UserMoneyDetailTypeEnum.hongbao);

         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

@@ -241,12 +251,16 @@
         // 本月到账

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliNew);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);

         typeList.add(UserMoneyDetailTypeEnum.share);

         typeList.add(UserMoneyDetailTypeEnum.shareNew);

         typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.invite);

         typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

         typeList.add(UserMoneyDetailTypeEnum.teamReward);

         typeList.add(UserMoneyDetailTypeEnum.weiQuan);

         typeList.add(UserMoneyDetailTypeEnum.hongbao);

         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

@@ -271,13 +285,18 @@
         // 总的到账

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliNew);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);

         typeList.add(UserMoneyDetailTypeEnum.orderReward);

         typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);

         typeList.add(UserMoneyDetailTypeEnum.share);

         typeList.add(UserMoneyDetailTypeEnum.shareNew);

         typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.invite);

         typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

         typeList.add(UserMoneyDetailTypeEnum.teamReward);

         typeList.add(UserMoneyDetailTypeEnum.weiQuan);

         typeList.add(UserMoneyDetailTypeEnum.hongbao);

         typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

@@ -294,15 +313,20 @@
         // 总的自购返利

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.fanli);

         typeList.add(UserMoneyDetailTypeEnum.fanliNew);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

         typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuanNew);

         typeList.add(UserMoneyDetailTypeEnum.orderReward);

         typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);

         vo.setTotalFanLiMoney(

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



         // 累计成功提现

         typeList.clear();

         typeList.add(UserMoneyDetailTypeEnum.extract);

         typeList.add(UserMoneyDetailTypeEnum.extractNew);

         typeList.add(UserMoneyDetailTypeEnum.extractVerify);

         typeList.add(UserMoneyDetailTypeEnum.extractVerifyNew);

         typeList.add(UserMoneyDetailTypeEnum.extractAutoWX);

         typeList.add(UserMoneyDetailTypeEnum.extractReject);

         vo.setTotalExtractMoney(

@@ -312,6 +336,7 @@
      // 总的分享赚

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareNew);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      vo.setTotalShareMoney(

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