admin
2019-01-11 20f1758957a19bb5fec47fcc1c83818ee268676b
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)
@@ -254,6 +258,16 @@
      vo.setTotalShareMoney(
            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());
      maxDate = new Date(timeStamp);
      minDate = new Date(TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(timeStamp, "yyyy-MM"), "yyyy-MM"));
      // 本月未到账
      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(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)));
   }