dubbo修复

admin

2020-07-16 b7ab5bb0771b4c221c47a61f04aa2920509e4c4c

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

@@ -47,9 +47,9 @@
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import org.yeshi.utils.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import org.yeshi.utils.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

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

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

@@ -142,12 +142,20 @@
      if (!StringUtil.isNullOrEmpty(redisContent)) {

         vo = new Gson().fromJson(redisContent, MoneyStatisticVO.class);

         if (vo != null) {

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

            vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));

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

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

            }

         }

      }

@@ -164,7 +172,7 @@
      UserInfo user = userInfoService.getUserById(uid);



      MoneyStatisticVO vo = new MoneyStatisticVO();

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

      vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));

      vo.setBalanceMoney(user.getMyHongBao());

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



@@ -242,6 +250,21 @@
      vo.setTotalInviteMoney(

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

      typeList.add(UserMoneyDetailTypeEnum.orderRewardNew);

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareNew);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      vo.setTotalMoney(

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





      

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

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

@@ -306,7 +329,7 @@
      UserInfo user = userInfoService.getUserById(uid);



      MoneyStatisticVO vo = new MoneyStatisticVO();

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

      vo.setLink(configService.getValue(ConfigKeyEnum.autoExtractHelpUrl.getKey(),acceptData.getSystem()));

      vo.setBalanceMoney(user.getMyHongBao());

      // 获取提现中的信息

      BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

@@ -865,7 +888,6 @@
    * 订单统计-h5

    * 

    * @param acceptData

    * @param id

    * @param out

    */

   @RequestMapping(value = "countTeamOrderNum")