自动提现处理

admin

2019-09-08 2db0485ab8aa814499adf49112c5aa9e4c9e78b2

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

@@ -13,7 +13,6 @@


import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.yeshi.utils.BigDecimalUtil;

import org.yeshi.utils.JsonUtil;



import com.google.gson.Gson;

@@ -26,11 +25,14 @@
import com.google.gson.stream.JsonReader;

import com.google.gson.stream.JsonWriter;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

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

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

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

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.vo.money.UserMoneyDetailHistoryVO;

@@ -56,6 +58,12 @@


   @Resource

   private HongBaoV2Service hongBaoV2Service;



   @Resource

   private ExtractService extractService;



   @Resource

   private UserInfoExtraService userInfoExtraService;



   /**

    * 新版资金详情（1.4.9）

@@ -152,8 +160,9 @@
         out.print(JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }

      UserInfo user = userInfoService.getUserById(uid);



      BigDecimal balance = userInfoService.getUserById(uid).getMyHongBao();

      BigDecimal balance = user.getMyHongBao();



      UserMoneyStatisticVO vo = new UserMoneyStatisticVO();

      vo.setBalanceMoney(balance);

@@ -265,13 +274,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>() {

@@ -287,6 +298,23 @@
         }

      });



      // 获取提现中的信息



      BigDecimal extractingMoney = extractService.sumVerifyingMoney(uid);

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

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

      // 获取是否绑定了微信

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

         vo.setBindingWX(true);

      } else

         vo.setBindingWX(false);



      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null && extra.getAutoExtract() != null && extra.getAutoExtract() == true)

         vo.setAutoExtract(true);

      else

         vo.setAutoExtract(false);



      out.print(JsonUtil.loadTrueResult(builder.create().toJson(vo)));

   }