修改资金统计信息，优化H5的商品详情

admin

2019-01-11 20f1758957a19bb5fec47fcc1c83818ee268676b

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

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

import java.lang.reflect.Type;

import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Calendar;

import java.util.Date;

import java.util.List;

@@ -24,8 +25,9 @@
import com.google.gson.stream.JsonReader;

import com.google.gson.stream.JsonWriter;

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

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

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

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

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;

@@ -47,6 +49,12 @@


   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   @Resource

   private UserInfoService userInfoService;



   @Resource

   private HongBaoV2Service hongBaoV2Service;



   /**

    * 新版资金详情（1.4.9）

@@ -129,22 +137,137 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 用户资金统计

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getUserMoneyStatistic")

   public void getUserMoneyStatistic(AcceptData acceptData, Long uid, PrintWriter out) {

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

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

         return;

      }



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



      UserMoneyStatisticVO vo = new UserMoneyStatisticVO();

      vo.setBalanceMoney(new BigDecimal("0.02"));

      vo.setLastMonthExtractMoney(new BigDecimal("0.03"));

      vo.setLastMonthRecievedMoney(new BigDecimal("0.04"));

      vo.setLatestThreeMonthRecievedMoney(new BigDecimal("0.05"));

      vo.setMonthExtractMoney(new BigDecimal("0.06"));

      vo.setMonthRecievedMoney(new BigDecimal("0.07"));

      vo.setTotalInviteMoney(new BigDecimal("0.08"));

      vo.setTotalRecievedMoney(new BigDecimal("0.09"));

      vo.setTotalShareMoney(new BigDecimal("0.10"));

      vo.setBalanceMoney(balance);

      Date minDate = null;

      Date maxDate = null;

      List<UserMoneyDetailTypeEnum> typeList = new ArrayList<>();



      // 上月提现

      typeList.clear();



      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);

      long timeStamp = System.currentTimeMillis();

      Calendar calendar = Calendar.getInstance();

      calendar.setTimeInMillis(timeStamp);

      maxDate = new Date(TimeUtil

            .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

      calendar.add(Calendar.MONTH, -1);

      minDate = new Date(TimeUtil

            .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));



      vo.setLastMonthExtractMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 上月收入

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

      typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

      typeList.add(UserMoneyDetailTypeEnum.weiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbao);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);



      vo.setLastMonthRecievedMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 最近三个月收入

      maxDate = new Date(timeStamp);

      minDate = new Date(timeStamp - 1000 * 60 * 60 * 24 * 90L);



      vo.setLatestThreeMonthRecievedMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 本月提现

      maxDate = new Date(timeStamp);

      calendar = Calendar.getInstance();

      minDate = new Date(TimeUtil

            .convertToTimeTemp(calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1), "yyyy-M"));

      calendar.add(Calendar.MONTH, -1);

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.extract);

      typeList.add(UserMoneyDetailTypeEnum.extractReject);

      typeList.add(UserMoneyDetailTypeEnum.extractVerify);



      vo.setMonthExtractMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 本月到账

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

      typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

      typeList.add(UserMoneyDetailTypeEnum.weiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbao);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);



      vo.setMonthRecievedMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 总的邀请赚

      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);



      minDate = new Date(0L);

      maxDate = new Date(timeStamp);

      vo.setTotalInviteMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 总的到账



      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.fanli);

      typeList.add(UserMoneyDetailTypeEnum.fanliWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.invite);

      typeList.add(UserMoneyDetailTypeEnum.inviteWeiQuan);

      typeList.add(UserMoneyDetailTypeEnum.inviteAndShare);

      typeList.add(UserMoneyDetailTypeEnum.weiQuan);

      typeList.add(UserMoneyDetailTypeEnum.hongbao);

      typeList.add(UserMoneyDetailTypeEnum.hongbaoDeduct);

      vo.setTotalRecievedMoney(

            userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, minDate, maxDate).abs());

      // 总的分享赚



      typeList.clear();

      typeList.add(UserMoneyDetailTypeEnum.share);

      typeList.add(UserMoneyDetailTypeEnum.shareWeiQuan);



      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"));



      // 本月未到账

      vo.setMonthUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));



      // 全部未到账

      minDate = new Date(0);

      vo.setTotalUnRecievedMoney(hongBaoV2Service.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate));

      Gson gson = JsonUtil.getConvertBigDecimalToStringSubZeroBuilder(new GsonBuilder()).create();

      out.print(JsonUtil.loadTrueResult(gson.toJson(vo)));

   }