优化资金明细

admin

2018-12-24 46906f31ebc49cde75b65d71bb06f228997148dc

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

@@ -3,6 +3,7 @@
import java.io.IOException;

import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.util.Calendar;

import java.util.Date;

import java.util.List;



@@ -24,6 +25,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;

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

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

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.vo.money.UserMoneyDetailHistoryVO;



@@ -72,7 +74,12 @@


      if (year != null && month != null) {

         date = new Date(TimeUtil.convertToTimeTemp(year + "-" + month, "yyyy-M"));

         Calendar ca = Calendar.getInstance();

         ca.setTime(date);

         ca.add(Calendar.MONTH, 1);

         date = new Date(ca.getTimeInMillis() - 1);

      }



      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, date);

      long count = userMoneyDetailService.countUserMoneyDetailForClient(uid, index, date);

      GsonBuilder gsonBuilder = JsonUtil.getConvertBigDecimalToStringBuilder(new GsonBuilder())

@@ -87,7 +94,8 @@
         public void write(JsonWriter out, UserMoneyDetailTypeEnum arg1) throws IOException {

            out.beginObject();

            out.name("portrait").value(arg1.getPicture());

            out.name("helpUrl").value(arg1.getHelpUrl());

            if (!StringUtil.isNullOrEmpty(arg1.getHelpUrl()))

               out.name("helpUrl").value(arg1.getHelpUrl());

            out.endObject();

         }

      }).registerTypeAdapter(Date.class, new JsonSerializer<Date>() {