bug修改

admin

2019-01-26 6a486f505881408d991cebfae2c20cb5108a7746

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

@@ -26,6 +26,7 @@
import com.google.gson.stream.JsonWriter;

import com.yeshi.fanli.entity.accept.AcceptData;

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

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

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

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

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -51,6 +52,9 @@


   @Resource

   private UserInfoService userInfoService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;



   /**

    * 新版资金详情（1.4.9）

@@ -226,7 +230,7 @@
      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

		


      minDate = new Date(0L);

      maxDate = new Date(timeStamp);

      vo.setTotalInviteMoney(

@@ -254,6 +258,19 @@


      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(ca.getTimeInMillis());



      // 本月未到账

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



      // 全部未到账

      minDate = new Date(0);

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

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();

      out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));

   }