首页悬浮图mapperbug修改，增加商品详情中的比例展示

admin

2020-01-01 c8f11c229b87d1652b6da0b15576c166cd51eb8b

 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;

@@ -30,6 +31,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

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 +73,9 @@
   @Resource

   private ConfigService configService;



   @Resource

   private HongBaoV2CountService hongBaoV2CountService;



   /**

    * 新版资金详情（1.4.9）

    * 

@@ -110,8 +115,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

@@ -286,8 +292,16 @@
      maxDate = new Date(

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



      // 本月未到账

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

      // 本月未到账,以app端我的页面上月收益为准



      BigDecimal selfMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 1);

      BigDecimal shareMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 2);

      BigDecimal inviteMoney = hongBaoV2CountService.getRewardMoneyToCount(uid, 4, 3);



		
      BigDecimal monthUnRecievedMoney = selfMoney.setScale(2, BigDecimal.ROUND_DOWN)

            .add(shareMoney.setScale(2, BigDecimal.ROUND_DOWN)).add(inviteMoney.setScale(2, BigDecimal.ROUND_DOWN));

      vo.setMonthUnRecievedMoney(monthUnRecievedMoney);



      // 全部未到账

      minDate = new Date(0);

@@ -311,7 +325,7 @@
         // 获取提现中的信息

         BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

         if (extractingMoney.compareTo(new BigDecimal(0)) > 0)

            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));

            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2, RoundingMode.HALF_UP));

         // 获取是否绑定了微信

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

            vo.setBindingWX(true);