小黄条

yujian

2019-12-10 c8041ec0544bf122e6819e6bf698997ccbf30aaf

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

@@ -4,6 +4,7 @@
import java.io.PrintWriter;

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.math.RoundingMode;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

@@ -30,11 +31,12 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail.UserMoneyDetailTypeEnum;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.service.inter.config.ConfigService;

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

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

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

import com.yeshi.fanli.service.inter.money.extract.ExtractService;

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

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

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

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

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.VersionUtil;

@@ -82,11 +84,14 @@
    *            年份

    * @param month

    *            月份

    * @param type

    *            1-收入 2-支出 0-全部

    * 
    * @param out

    */

   @RequestMapping(value = "getUserMoneyDetailList")

   public void getUserMoneyDetailList(AcceptData acceptData, Long uid, Long index, Integer year, Integer month,

         PrintWriter out) {

         Integer type, PrintWriter out) {

      if (uid == null || uid == 0) {

         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

@@ -107,8 +112,9 @@
         date = new Date(ca.getTimeInMillis() - 1);

      }



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

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

      List<UserMoneyDetailHistoryVO> list = userMoneyDetailService.listUserMoneyDetailForClient(uid, index, type,

            date);

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

      GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

      gsonBuilder.registerTypeAdapter(UserMoneyDetailTypeEnum.class, new TypeAdapter<UserMoneyDetailTypeEnum>() {

         @Override

@@ -308,7 +314,7 @@
         // 获取提现中的信息

         BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

         if (extractingMoney.compareTo(new BigDecimal(0)) > 0)

            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2));

            vo.setExtractingMoneyInfo("提现中:¥" + extractingMoney.setScale(2, RoundingMode.HALF_UP));

         // 获取是否绑定了微信

         if (!StringUtil.isNullOrEmpty(user.getWxUnionId())) {

            vo.setBindingWX(true);

@@ -393,6 +399,7 @@
         UserInfoExtra update = new UserInfoExtra();

         update.setId(userExtra.getId());

         update.setAutoExtract(false);

         update.setCloseTimeExtract(new Date());

         try {

            userInfoExtraService.saveUserInfoExtra(update);

         } catch (UserInfoExtraException e) {