足迹、收藏订单兼容新需求

yujian

2020-05-23 28cf328a098334b51a3e9d2d56f983fb8c862211

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

@@ -25,13 +25,15 @@
import com.google.gson.JsonSerializer;

import com.yeshi.fanli.dto.user.UserInviteLevelEnum;

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

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

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

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

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

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

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

import com.yeshi.fanli.entity.bus.user.vip.TearcherInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPInfo;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

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

import com.yeshi.fanli.entity.push.DeviceActive;

import com.yeshi.fanli.entity.shop.BanLiShopOrder;

@@ -46,6 +48,7 @@
import com.yeshi.fanli.service.inter.homemodule.HomeNavbarUserService;

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

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.service.inter.push.DeviceActiveService;

@@ -73,7 +76,9 @@
import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteService;

import com.yeshi.fanli.service.inter.user.invite.UserInviteValidNumService;

import com.yeshi.fanli.service.inter.user.vip.TearcherService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVIPPreInfoService;

import com.yeshi.fanli.service.inter.user.vip.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

@@ -83,6 +88,7 @@
import com.yeshi.fanli.util.TimeUtil;

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

import com.yeshi.fanli.util.annotation.RequestSerializableByKey;

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

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



import net.sf.json.JSONObject;

@@ -204,6 +210,15 @@
   

   @Resource

   private UserInviteValidNumService userInviteValidNumService;

	
   @Resource

   private CommonOrderService commonOrderService;

	
   @Resource

   private TearcherService tearcherService;

	
   @Resource

   private UserVIPPreInfoService userVIPPreInfoService;

   

   

   /**

@@ -474,7 +489,7 @@
               continue;

            }

            // 1、邀请关系成功后；2、单（分享 + 自购）实付款大于1元

            long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);

            long countValid = commonOrderService.countOrderByUidAndSettled(worker.getId(), payMoney);

            if (countValid > 0) {

               finishTeam ++;

            }

@@ -539,79 +554,7 @@
         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "用户未登录"));

         return;

      }



      UserInfo userInfo = userInfoService.selectByPKey(uid);

      if (userInfo == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "该用户不存在"));

         return;

      }



      // 省钱 -自购产生返利



      List<Integer> list = new ArrayList<Integer>();

      list.add(BanLiShopOrder.STATE_SUCCESS);

      BigDecimal payMoney = new BigDecimal(userVipConfigService.getValueByKey("require_order_pay"));



      BigDecimal finishGoldCoin = integralDetailService.getCumulativeMoney(uid);

      

//      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

//            TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME), payMoney);

//	
      long finishTeam = 0L;

      long vipBegin = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);

      List<ThreeSale> listThreeSale = threeSaleSerivce.getValidWorkerIdsByTime(uid, vipBegin);

      if (listThreeSale != null && listThreeSale.size() > 0) {

         for (ThreeSale three: listThreeSale) {

            UserInfo worker = three.getWorker();

            if (worker == null || worker.getId() == null) {

               continue;

            }

            // 1、邀请关系成功后；2、单（分享 + 自购）实付款大于1元

            long countValid = hongBaoV2CountService.countValidOrderByUidAndTime(worker.getId(), three.getSucceedTime(), payMoney);

            if (countValid > 0) {

               finishTeam ++;

            }

         }

      }

		
      long finishHongBao = banLiShopOrderService.countByUidAndState(uid, list);

      BigDecimal finishMoney = hongBaoV2CountService.getRewardMoneyBySelf(uid);



      long limitTeam = 0;



      // 区分老用户和新用户

      String limtDate = userVipConfigService.getValueByKey("vip_execute_time");

      Date executeDate = null;

      try {

         SimpleDateFormat format = new SimpleDateFormat("yyyy-mm-dd");

         executeDate = format.parse(limtDate);

      } catch (ParseException e) {

         e.printStackTrace();

      }



      UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);

      if (extra != null

            && (extra.getFirstLoginTime() == null || extra.getFirstLoginTime().getTime() < executeDate.getTime())) {

         limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_old_user")));

      } else {

         limitTeam = (Long.parseLong(userVipConfigService.getValueByKey("require_invite_num_new_user")));

      }

      long limitHongBao = (Long.parseLong(userVipConfigService.getValueByKey("require_shop_buy")));

      BigDecimal limitMoney = (new BigDecimal(userVipConfigService.getValueByKey("require_fan_money")));

      BigDecimal limitgoldCoin = (new BigDecimal(userVipConfigService.getValueByKey("require_gold_coin")));



      if (finishGoldCoin.compareTo(limitgoldCoin) >= 0 && finishTeam >= limitTeam && finishHongBao >= limitHongBao

            && finishMoney.compareTo(limitMoney) >= 0) {// 条件符合

         ;

      } else {

         if (!StringUtil.isNullOrEmpty(callback)) {

            out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("未达到开通条件")));

         } else {

            out.print(JsonUtil.loadFalseResult("未达到开通条件"));

         }

         return;

      }

      // 开通

      try {

         userVIPInfoService.applyVIP(uid);

      } catch (UserVIPInfoException e) {

@@ -624,9 +567,9 @@
      }



      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("")));

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("申请成功，正在受理中")));

      } else {

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

         out.print(JsonUtil.loadTrueResult("申请成功，正在受理中"));

      }

   }



@@ -656,51 +599,13 @@
      UserInviteLevelEnum level = userInviteService.getUserInviteLevelNew(uid);

      

      // 达人

      long limitZiGou = 0;

      long limitShare = 0;

      long limitOrder = 0;

      long limitFirst = 0;

      long limitSecond = 0;

      String school = "板栗学院";

      String platformSubsidy = "补贴返佣 ";

      String teamSubsidy = "会员专属";

      String teamReward = "超级会员专属";

      if (level == UserInviteLevelEnum.actived ||  level == UserInviteLevelEnum.noActive) {

         // TODO 比例

         school += "达人班";

         platformSubsidy += "<label style=\"color:#E5005C;\">52.5%</label>";

			
			
         String zigou = userVipConfigService.getValueByKey("vip_pre_3_zigou_order_count");

         if (!StringUtil.isNullOrEmpty(zigou)) {

            limitZiGou = Long.parseLong(zigou);

         }

         String share = userVipConfigService.getValueByKey("vip_pre_3_share_order_count");

         if (!StringUtil.isNullOrEmpty(share)) {

            limitShare = Long.parseLong(share);

         }

         String first = userVipConfigService.getValueByKey("vip_pre_3_first_level_team_count");

         if (!StringUtil.isNullOrEmpty(first)) {

            limitFirst = Long.parseLong(first);

         }

         String second = userVipConfigService.getValueByKey("vip_pre_3_second_level_team_count");

         if (!StringUtil.isNullOrEmpty(second)) {

            limitSecond = Long.parseLong(second);

         }

      } else if (level == UserInviteLevelEnum.vipPre1) {

			
         // TODO 比例

         school += "普通班";

         platformSubsidy += "<label style=\"color:#E5005C;\">60%</label>";

         teamSubsidy = "会员专属最高<label style=\"color:#E5005C;\">7.5%</label>";

			
						
         String zigou = userVipConfigService.getValueByKey("vip_pre_7_zigou_order_count");

         if (!StringUtil.isNullOrEmpty(zigou)) {

            limitZiGou = Long.parseLong(zigou);

         }

         String share = userVipConfigService.getValueByKey("vip_pre_7_share_order_count");

         if (!StringUtil.isNullOrEmpty(share)) {

            limitShare = Long.parseLong(share);

         String orderCount = userVipConfigService.getValueByKey("vip_pre_7_order_count");

         if (!StringUtil.isNullOrEmpty(orderCount)) {

            limitOrder = Long.parseLong(orderCount);

         }

         String first = userVipConfigService.getValueByKey("vip_pre_7_first_level_team_count");

         if (!StringUtil.isNullOrEmpty(first)) {

@@ -710,18 +615,10 @@
         if (!StringUtil.isNullOrEmpty(second)) {

            limitSecond = Long.parseLong(second);

         }

      } else if (level == UserInviteLevelEnum.vipPre2 || level == UserInviteLevelEnum.vipApply) {

         school += "高级班";

         platformSubsidy += "<label style=\"color:#E5005C;\">70%</label>";

         teamSubsidy = "会员专属最高<label style=\"color:#E5005C;\">15%</label>";

			
         String zigou = userVipConfigService.getValueByKey("vip_pre_10_zigou_order_count");

         if (!StringUtil.isNullOrEmpty(zigou)) {

            limitZiGou = Long.parseLong(zigou);

         }

         String share = userVipConfigService.getValueByKey("vip_pre_10_share_order_count");

         if (!StringUtil.isNullOrEmpty(share)) {

            limitShare = Long.parseLong(share);

      } else if (level == UserInviteLevelEnum.highVIP || level == UserInviteLevelEnum.vipApply) {

         String orderCount = userVipConfigService.getValueByKey("vip_pre_10_order_count");

         if (!StringUtil.isNullOrEmpty(orderCount)) {

            limitOrder = Long.parseLong(orderCount);

         }

         String first = userVipConfigService.getValueByKey("vip_pre_10_first_level_team_count");

         if (!StringUtil.isNullOrEmpty(first)) {

@@ -733,26 +630,13 @@
         }

      } else if (level == UserInviteLevelEnum.vip || level == UserInviteLevelEnum.tearcherApply) {

         // TODO 比例

         school += "超级班";

         platformSubsidy += "<label style=\"color:#E5005C;\">115%</label>";

         teamSubsidy = "会员专属最高<label style=\"color:#E5005C;\">22.5%</label>";

         teamReward = "超级会员专属最高<label style=\"color:#E5005C;\">40%</label>";

         

      } else if (level == UserInviteLevelEnum.tearcher) {

         // TODO

      }

      

      // 邀请订单

      long doneZiGou = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_ZIGOU);

      // 邀请订单

      long doneShare = hongBaoV2CountService.counOrderByUidAndOrderType(uid, Constant.VIP_ORDER_PAY,

            HongBaoV2.TYPE_SHARE_GOODS);

		
		
      Date now = new Date();

      Date start = new Date(0);

		
      // 自购订单

      long doneOrder = hongBaoV2CountService.countMyDirectOrderByCashArrival(uid, Constant.VIP_ORDER_PAY);

      // 有效粉丝

      int doneFirst = 0;

      int doneSecond = 0;

@@ -762,6 +646,8 @@
         doneSecond = userInviteValidNum.getNumSecond() == null ? 0 : userInviteValidNum.getNumSecond();

      }

      

      Date now = new Date();

      Date start = new Date(0);

      // 省钱： ---返利订单、奖励券提成

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

      typeFanli.add(UserMoneyDetailTypeEnum.fanli);

@@ -776,12 +662,31 @@
      typeList.add(UserMoneyDetailTypeEnum.systemEqualize);

      typeList.add(UserMoneyDetailTypeEnum.subsidy);

      BigDecimal earnMoney = userMoneyDetailService.statisticUserTypeMoneyWithDate(uid, typeList, start, now).abs();

		
      if (level != UserInviteLevelEnum.vip) {

         BigDecimal rate = new BigDecimal("0.409");

         saveMoney = MoneyBigDecimalUtil.mul2(saveMoney, rate);

         earnMoney = MoneyBigDecimalUtil.mul2(earnMoney, rate);

      }

		
      String shareRate = "可享佣金的<label style=\"color:#E5005C;\">%s</label>";

      String teamRate = "最高佣金的<label style=\"color:#E5005C;\">%s</label>";

      // 达人版

      JSONObject jsonrRed1 = new JSONObject();

      jsonrRed1.put("enjoyRate", String.format(shareRate, "145%"));

      jsonrRed1.put("teamRate", String.format(teamRate, "25%"));

      jsonrRed1.put("teamIncome", "高级会员以上专属");

		
      // 高级会员

      JSONObject jsonrRed2 = new JSONObject();

      jsonrRed2.put("enjoyRate", String.format(shareRate, "195%"));

      jsonrRed2.put("teamRate", String.format(teamRate, "50%"));

      jsonrRed2.put("teamIncome", "享高级团队收益");

		
      // 超级会员

      JSONObject jsonrRed3 = new JSONObject();

      jsonrRed3.put("enjoyRate", String.format(shareRate, "210%"));

      jsonrRed3.put("teamRate", String.format(teamRate, "110%"));

      jsonrRed3.put("teamIncome", "享超级团队收益");

      

      

      JSONObject json = new JSONObject();

@@ -789,31 +694,54 @@
      json.put("nickName", userInfo.getNickName());

      json.put("portrait", userInfo.getPortrait());

      json.put("ruleLink", userVipConfigService.getValueByKey("help_link_vip_h5"));

      json.put("tearcherTip", "导师按钮：弹框内容");

      json.put("saveMoney", saveMoney);

      json.put("earnMoney", earnMoney);

      

      String tearcherWX = "";

      TearcherInfo tearcherInfo = tearcherService.selectByUid(uid);

      if (tearcherInfo != null && !StringUtil.isNullOrEmpty(tearcherInfo.getWxID())) {

         tearcherWX = tearcherInfo.getWxID();

      }

      json.put("tearcherWX", tearcherWX);

      json.put("tearcherTip", "我是你的导师，为你在省赚过程中解难答疑，对你一对一辅导，倾听你的需求总结并反馈给板栗快省官方运营团队，快来添加我吧。");

      json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));

		
      // 已完成

      json.put("doneZiGou", doneZiGou);

      json.put("doneShare", doneShare);

      json.put("doneOrder", doneOrder);

      json.put("doneFirst", doneFirst);

      json.put("doneSecond", doneSecond);

      

      // 标准

      json.put("limitZiGou", limitZiGou);

      json.put("limitShare", limitShare);

      json.put("limitOrder", limitOrder);

      json.put("limitFirst", limitFirst);

      json.put("limitSecond", limitSecond);

      

      // 文字内容

      json.put("platformSubsidy", platformSubsidy);

      json.put("school", school);

      json.put("teamSubsidy", teamSubsidy);

      json.put("teamReward", teamReward);



      // 已完成

      json.put("daRen", jsonrRed1);

      json.put("highVIP", jsonrRed2);

      json.put("superVIP", jsonrRed3);

		
      // 人工客服链接

      json.put("csdLink", configService.get(ConfigKeyEnum.customerServiceLink.getKey()));

      

      UserVIPInfo userVIPInfo = userVIPInfoService.selectByUid(uid);

      String leftTime = "";

      if (userVIPInfo != null && userVIPInfo.getState() == UserVIPInfo.STATE_VERIFING &&  userVIPInfo.getApplyTime() != null) {

         long s = 48 * 60 * 60 - ((System.currentTimeMillis() - userVIPInfo.getApplyTime().getTime()) / 1000);

         if (s > 3600) {

            leftTime = s / 3600 + "小时";

            leftTime = "还剩" + leftTime;

         } else if (s >= 60) {

            leftTime = s / 60 + "分钟";

            leftTime = "还剩" + leftTime;

         } else if (s > 0) {

            leftTime = s + "秒";

            leftTime = "还剩" + leftTime;

         } else {

            leftTime = "还剩0秒";

         }

      }

      json.put("leftTime", leftTime);

      if (!StringUtil.isNullOrEmpty(callback)) {

         out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult(json)));

      } else {

@@ -821,4 +749,38 @@
      }

   }



	
   /**

    * 获取vip信息

    * 
    * @param acceptData

    * @param uid

    * @param out

    */

   @RequestMapping(value = "getVIPSuccessInfo")

   public void getVIPSuccessInfo(String callback, AcceptData acceptData, Long uid, PrintWriter out) {

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

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

         return;

      }



      UserVIPPreInfo vipInfo = userVIPPreInfoService.getLatestProcessInfo(uid);

      if (vipInfo == null) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(1, "还未升级成为会员"));

         return;

      }

		
      UserLevelEnum level = UserLevelUtil.getByLevel(vipInfo.getProcess());

      if (level == null) {

         level = UserLevelEnum.daRen;

      }

      UserLevelEnum showLevel = UserLevelUtil.getShowLevel(level);

		
      String desc = "你于"+ TimeUtil.formatDateDot(vipInfo.getCreateTime()) +"升级为" +  showLevel.getName();

		
      JSONObject json = new JSONObject();

      json.put("desc", desc);

      JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(json));

   }



}