admin
2019-01-26 6a486f505881408d991cebfae2c20cb5108a7746
fanli/src/main/java/com/yeshi/fanli/controller/client/UserMoneyController.java
@@ -259,11 +259,14 @@
      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"));
      Calendar ca = Calendar.getInstance();
      ca.setTime(new Date(timeStamp));
      ca.add(Calendar.MONTH, 1);
      maxDate = new Date(ca.getTimeInMillis());
      // 本月未到账
      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));
      // 全部未到账
      minDate = new Date(0);