资金明细增加团队分红

admin

2020-04-15 ee5c8055b1c0dd7c67a9025a76b10bd287c93d9a

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java

@@ -58,14 +58,12 @@
import com.yeshi.fanli.util.VersionUtil;

import com.yeshi.fanli.util.account.UserUtil;

import com.yeshi.fanli.util.user.UserLevelUtil;

import com.yeshi.fanli.vo.msg.ClientTextStyleVO;

import com.yeshi.fanli.vo.order.CommonOrderVO;

import com.yeshi.fanli.vo.order.CurrentBonusVO;

import com.yeshi.fanli.vo.order.GoodsRebateVO;

import com.yeshi.fanli.vo.order.HongBaoCountVO;

import com.yeshi.fanli.vo.order.OrderCountVO;

import com.yeshi.fanli.vo.order.OrderRebateVO;

import com.yeshi.fanli.vo.order.TeamBonusVO;

import com.yeshi.fanli.vo.user.UserInfoExtraVO;

import com.yeshi.fanli.vo.user.UserSettingsVO;



@@ -299,7 +297,6 @@
         data.put("count", count);

         data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));

         data.put("helpUrl", configService.get(ConfigKeyEnum.orderListHelp.getKey()));

         data.put("bonusLink", configService.get(ConfigKeyEnum.orderBonusLink.getKey()));

         data.put("validMoney", "¥ " + validMoney);

         data.put("invalidMoney", "¥ " + invalidMoney);

         data.put("findOrderHelpUrl", orderFindUrl);

@@ -506,153 +503,6 @@
      out.print(JsonUtil.loadTrueResult(data));

   }



   /**

    * 团队收益统计  统计已到账未到账 ： 累计只统计已到账

    * @param acceptData

    * @param uid

    * @param type 1-团队补贴   2-团队奖励 3-导师津贴

    */

   @RequestMapping(value = "getTeamBonus", method = RequestMethod.POST)

   public void getTeamBonus(AcceptData acceptData, Long uid, Integer type, PrintWriter out) {

      if (uid == null) {

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

         return;

      }



      UserInfo user = userInfoService.selectByPKey(uid);

      if (user == null) {

         out.print(JsonUtil.loadFalseResult(1, "用户不存在"));

         return;

      }



      if (type == null || type < 1 || type > 3) {

         type = 1;

      }



      if (type == 1) {

         // 补贴

         sumTeamSubsidy(out, user);

      } else if (type == 2) {

         // 奖励

         //TODO 团队奖励已经删除

      } else {

         // 导师津贴

         JSONObject data = new JSONObject();

         data.put("exist", false);

         data.put("link", configService.get(ConfigKeyEnum.tutorSubsidyLink.getKey()));

         out.print(JsonUtil.loadTrueResult(data));

      }

   }



   /**

    * 统计补贴

    * @param out

    * @param user

    */

   private void sumTeamSubsidy(PrintWriter out, UserInfo user) {

      Long uid = user.getId();

      // 是否VIP

      boolean vip = userVIPInfoService.isVIP(uid);



      JSONObject data = new JSONObject();

      data.put("link", configService.get(ConfigKeyEnum.orderTeamSubsidyLink.getKey()));

      if (!vip) {

         data.put("exist", false);

         out.print(JsonUtil.loadTrueResult(data));

         return;

      }



      data.put("exist", true);

      data.put("portrait", user.getPortrait());



      // 今日统计

      BigDecimal todayDirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 1,

            InviteOrderSubsidy.LEVEL_ONE);

      if (todayDirect == null) {

         todayDirect = new BigDecimal(0);

      }

      BigDecimal todayIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 1,

            InviteOrderSubsidy.LEVEL_TWO);

      if (todayIndirect == null) {

         todayIndirect = new BigDecimal(0);

      }

      TeamBonusVO today = new TeamBonusVO();

      today.setDirect(todayDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      today.setIndirect(todayIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      today.setTotal(

            MoneyBigDecimalUtil.add(todayDirect, todayIndirect).setScale(2, BigDecimal.ROUND_DOWN).toString());



      // 昨日统计

      BigDecimal yesterdayDirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 2,

            InviteOrderSubsidy.LEVEL_ONE);

      if (yesterdayDirect == null) {

         yesterdayDirect = new BigDecimal(0);

      }

      BigDecimal yesterdayIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 2,

            InviteOrderSubsidy.LEVEL_TWO);

      if (yesterdayIndirect == null) {

         yesterdayIndirect = new BigDecimal(0);

      }

      TeamBonusVO yesterday = new TeamBonusVO();

      yesterday.setDirect(yesterdayDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      yesterday.setIndirect(yesterdayIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      yesterday.setTotal(MoneyBigDecimalUtil.add(yesterdayDirect, yesterdayIndirect)

            .setScale(2, BigDecimal.ROUND_DOWN).toString());



      // 本月统计

      BigDecimal thisMonthDirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 3,

            InviteOrderSubsidy.LEVEL_ONE);

      if (thisMonthDirect == null) {

         thisMonthDirect = new BigDecimal(0);

      }

      BigDecimal thisMonthIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 3,

            InviteOrderSubsidy.LEVEL_TWO);

      if (thisMonthIndirect == null) {

         thisMonthIndirect = new BigDecimal(0);

      }

      TeamBonusVO thisMonth = new TeamBonusVO();

      thisMonth.setDirect(thisMonthDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      thisMonth.setIndirect(thisMonthIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      thisMonth.setTotal(MoneyBigDecimalUtil.add(thisMonthDirect, thisMonthIndirect)

            .setScale(2, BigDecimal.ROUND_DOWN).toString());



      // 本月统计

      BigDecimal lastMonthDirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 4,

            InviteOrderSubsidy.LEVEL_ONE);

      if (lastMonthDirect == null) {

         lastMonthDirect = new BigDecimal(0);

      }

      BigDecimal lastMonthIndirect = inviteOrderSubsidyServiceV2.sumValidMoneyByUidAndDate(uid, 4,

            InviteOrderSubsidy.LEVEL_TWO);

      if (lastMonthIndirect == null) {

         lastMonthIndirect = new BigDecimal(0);

      }

      TeamBonusVO lastMonth = new TeamBonusVO();

      lastMonth.setDirect(lastMonthDirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      lastMonth.setIndirect(lastMonthIndirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      lastMonth.setTotal(MoneyBigDecimalUtil.add(lastMonthDirect, lastMonthIndirect)

            .setScale(2, BigDecimal.ROUND_DOWN).toString());



      BigDecimal direct = inviteOrderSubsidyServiceV2.sumRecievedMoneyByUid(uid, InviteOrderSubsidy.LEVEL_ONE);

      if (direct == null) {

         direct = new BigDecimal(0);

      }

      BigDecimal indirect = inviteOrderSubsidyServiceV2.sumRecievedMoneyByUid(uid, InviteOrderSubsidy.LEVEL_TWO);

      if (indirect == null) {

         indirect = new BigDecimal(0);

      }

      BigDecimal total = MoneyBigDecimalUtil.add(direct, indirect);



      data.put("today", today);

      data.put("yesterday", yesterday);

      data.put("thisMonth", thisMonth);

      data.put("lastMonth", lastMonth);

      data.put("total", total.setScale(2, BigDecimal.ROUND_DOWN).toString());

      data.put("direct", direct.setScale(2, BigDecimal.ROUND_DOWN).toString());

      data.put("indirect", indirect.setScale(2, BigDecimal.ROUND_DOWN).toString());

      out.print(JsonUtil.loadTrueResult(data));

   }



   

   /**

    * 返利说明

@@ -742,7 +592,7 @@
         }

      }

      orderRebateVO.setFanLiDesc(predictDesc + typeName);

      orderRebateVO.setFanLi("¥" + hongBao.setScale(2));

      orderRebateVO.setFanLi("¥" + hongBao.setScale(2, BigDecimal.ROUND_DOWN));

      

      HongBaoV2 hongBaoV2 = hoList.get(0).getHongBaoV2();

      UserLevelEnum userLevel = UserLevelUtil.getByOrderRank(hongBaoV2.getUrank());

@@ -771,7 +621,7 @@
            payment = hongBaoOrder.getCommonOrder().getSettlement();

         if (payment == null)

            payment = new BigDecimal(0);

         goodsVO.setActualPay("¥" + payment.setScale(2));

         goodsVO.setActualPay("¥" + payment.setScale(2, BigDecimal.ROUND_DOWN));

         

         BigDecimal commission = orderHongBaoMoneyComputeService.computeBaseFanliMoney(commonOrder);

         if (type == 3) { // 奖金

@@ -782,16 +632,20 @@
         

         // 平台补贴

         BigDecimal vipFanli = hongBaoOrder.getHongBaoV2().getMoney();

         goodsVO.setSubsidy("¥" + vipFanli.subtract(commission).setScale(2));

         goodsVO.setSubsidy("¥" + vipFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN));

         //  达人补贴

         if (userLevel != UserLevelEnum.daRen) {

            BigDecimal darenFanli = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, UserLevelEnum.daRen);

            goodsVO.setOriginSubsidy("¥" + darenFanli.subtract(commission).setScale(2) + "");

            goodsVO.setOriginSubsidy("¥" + darenFanli.subtract(commission).setScale(2, BigDecimal.ROUND_DOWN) + "");

         }

         

         voList.add(goodsVO);

		
         upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

			
         if (type == 1 ) {

            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, upperLevel));

         } else if (type == 2) {

            upperTotalMoney = upperTotalMoney.add(orderHongBaoMoneyComputeService.computeShareMoney(commonOrder, upperLevel));

         }

      }

         

      // 团队补贴

@@ -818,10 +672,12 @@
         }

         

         if (userLevel != UserLevelEnum.daRen) {

            orderRebateVO.setOriginSubsidy("¥" + lowerSubsidy.setScale(2));

            orderRebateVO.setOriginSubsidy("¥" + lowerSubsidy.setScale(2, BigDecimal.ROUND_DOWN));

         }

         orderRebateVO.setSubsidyDesc("团队补贴");

         orderRebateVO.setSubsidy("¥" + teamSubsidy.setScale(2) +"");

         orderRebateVO.setSubsidy("¥" + teamSubsidy.setScale(2, BigDecimal.ROUND_DOWN) +"");

			
         upperTotalMoney = upperTotalMoney.add(teamSubsidy);

      }

      

      orderRebateVO.setType(type);

@@ -831,6 +687,7 @@
      

      // 上级返利

      if (upperLevel != null) {

         upperTotalMoney = upperTotalMoney.add(hongBao);

         orderRebateVO.setUpperFanLi("¥" + upperTotalMoney);

         orderRebateVO.setJumpLink(upperLevel.getDetailLink());

      }

@@ -867,7 +724,7 @@
         orderRebateVO.setCouponType(1);

         orderRebateVO.setCouponUse(true);

         orderRebateVO.setCouponText("奖励成功");

         orderRebateVO.setCouponDesc("已再返¥" +couponMoney.setScale(2));

         orderRebateVO.setCouponDesc("已再返¥" +couponMoney.setScale(2, BigDecimal.ROUND_DOWN));

         orderRebateVO.setCouponParams(params.toString());

         orderRebateVO.setCouponJumpDetail(jumpDetailV2Service.getByTypeCache("rewardCouponDetail"));

      } else if (freeState > 0) { // 已使用免单券