admin
2019-09-06 2012b3b5db3c6b06535a68f775bcc81b16151b90
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMoneyController.java
@@ -265,13 +265,15 @@
      Calendar ca = Calendar.getInstance();
      ca.setTime(new Date(timeStamp));
      ca.add(Calendar.MONTH, 1);
      maxDate = new Date(ca.getTimeInMillis());
      maxDate = new Date(
            TimeUtil.convertToTimeTemp(TimeUtil.getGernalTime(ca.getTimeInMillis(), "yyyy-MM"), "yyyy-MM"));
      // 本月未到账
      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate));
      // 全部未到账
      minDate = new Date(0);
      maxDate=new Date(timeStamp);
      vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));
      GsonBuilder builder = new GsonBuilder();
      builder.registerTypeAdapter(BigDecimal.class, new JsonSerializer<BigDecimal>() {