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;

@@ -250,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("尽早确认收货可以促使资金尽早到账");