blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
yujian
2020-04-29 8a67a0754093b8c035951d1c4eea5b6aea583b4c 
 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java


@@ -4,6 +4,7 @@


import java.io.PrintWriter;



import java.lang.reflect.Type;



import java.math.BigDecimal;



import java.math.RoundingMode;



import java.util.ArrayList;



import java.util.Calendar;



import java.util.Date;



@@ -28,8 +29,10 @@


import com.yeshi.fanli.entity.bus.user.UserInfo;



import com.yeshi.fanli.entity.bus.user.UserInfoExtra;



import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;



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



import com.yeshi.fanli.exception.user.UserInfoExtraException;



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



import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;



import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;



import com.yeshi.fanli.service.inter.money.extract.ExtractService;



import com.yeshi.fanli.service.inter.order.HongBaoV2Service;



@@ -71,6 +74,9 @@


   @Resource



   private ConfigService configService;







   @Resource



   private HongBaoV2CountService hongBaoV2CountService;







   /**



    * 新版资金详情（1.4.9）



    * 



@@ -110,8 +116,9 @@


         date = new Date(ca.getTimeInMillis() - 1);



      }







      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, 0, date);



      long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, 0, date);



      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, type,



            date);



      long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, type, date);



      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();



      gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {



         @Override



@@ -181,10 +188,12 @@






      // 上月提现



      typeList.clear();







      typeList.add(UserMoneyDetailTypeEnum.extract);



      typeList.add(UserMoneyDetailTypeEnum.extractReject);



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



@@ -193,30 +202,9 @@


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



      // 上月收入



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



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







      vo.setLastMonthRecievedMoney(



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



      // 最近三个月收入



      maxDate = new Date(timeStamp);



      minDate = new Date(timeStamp - 1000 * 60 * 60 * 24 * 90L);







      vo.setLatestThreeMonthRecievedMoney(



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



      // 本月提现



      maxDate = new Date(timeStamp);



      calendar = Calendar.getInstance();



@@ -225,74 +213,147 @@


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



      typeList.clear();



      typeList.add(UserMoneyDetailTypeEnum.extract);



      typeList.add(UserMoneyDetailTypeEnum.extractReject);



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



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







      vo.setMonthRecievedMoney(



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



         // 上月收入



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







         vo.setLastMonthRecievedMoney(



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



         // 最近三个月收入



         maxDate = new Date(timeStamp);



         minDate = new Date(timeStamp - 1000 * 60 * 60 * 24 * 90L);







         vo.setLatestThreeMonthRecievedMoney(



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







         // 本月到账



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



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



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







         // 总的到账



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



         typeList.add(UserMoneyDetailTypeEnum.subsidy);



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



         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(



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



      }







      // 总的分享赚



      typeList.clear();



      typeList.add(UserMoneyDetailTypeEnum.share);



      typeList.add(UserMoneyDetailTypeEnum.shareNew);



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







      minDate = new Date(0L);



      maxDate = new Date(timeStamp);



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



         typeList.add(UserMoneyDetailTypeEnum.subsidy);



         typeList.add(UserMoneyDetailTypeEnum.teamReward);



      }



		


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



      ca.setTime(new Date(timeStamp));



      ca.add(Calendar.MONTH, 1);



      maxDate = new Date(



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







      // 本月未到账



      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));







      // 全部未到账



      minDate = new Date(0);



      maxDate = new Date(timeStamp);



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



      GsonBuilder builder = new GsonBuilder();



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



         @Override



@@ -307,11 +368,13 @@


         }



      });







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



      // 获取提现中的信息



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



@@ -337,7 +400,7 @@


         else



            vo.setAutoExtract(false);







         vo.setAutoExtractHelpUrl(configService.get("auto_extract_help_url"));



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



         vo.setOpenAutoExtractMsg("自动提现必须要微信授权，当账户中的余额≥2元时，系统在保障你资金安全的情况下，以微信红包的形式完成提现");



         vo.setCloseAutoExtractMsg("关闭自动提现后，60天以内将不自动提现，60天后系统将会自动开启，敬请知晓");



      }