订单接口筛选统计数据调整

yujian

2019-01-04 38fffe4319f408b5dc1da23d30512e90b0f4feac

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

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

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;



@@ -23,9 +26,13 @@
import com.google.gson.stream.JsonWriter;

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

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

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;

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



import net.sf.json.JSONObject;



@@ -41,6 +48,9 @@


   @Resource

   private UserMoneyDetailService userMoneyDetailService;



   @Resource

   private UserInfoService userInfoService;



   /**

    * 新版资金详情（1.4.9）

@@ -72,11 +82,15 @@


      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())

            .excludeFieldsWithoutExposeAnnotation();

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

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

         @Override

         public UserMoneyDetailTypeEnum read(JsonReader arg0) throws IOException {

@@ -87,7 +101,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>() {

@@ -99,6 +114,15 @@
               return new JsonPrimitive(TimeUtil.getGernalTime(value.getTime(), "yyyy.MM.dd HH:mm"));

            }

         }

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

         @Override

         public JsonElement serialize(BigDecimal value, Type theType, JsonSerializationContext context) {

            if (value == null) {

               return new JsonPrimitive("");

            } else {

               return new JsonPrimitive(MoneyBigDecimalUtil.getWithNoZera(value).toString());

            }

         }

      });



      Gson gson = gsonBuilder.create();

@@ -109,4 +133,127 @@
      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(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);

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

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

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

   }



}