Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/controller/wxmp/v1/UserAccountController.java

@@ -13,6 +13,7 @@
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpSession;



import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Controller;

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

import org.yeshi.utils.IPUtil;

@@ -33,6 +34,7 @@
import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

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.WeiXinUser;

@@ -43,14 +45,17 @@
import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.exception.user.UserInfoExtraException;

import com.yeshi.fanli.exception.user.vip.UserVIPInfoException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;

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

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

import com.yeshi.fanli.service.inter.shop.BanLiShopOrderService;

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

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.wx.WXMPUserLoginService;

@@ -106,6 +111,14 @@


   @Resource

   private HongBaoV2CountService hongBaoV2CountService;

	
   @Resource

   private ThreeSaleSerivce threeSaleSerivce;



   @Resource

   private CommonOrderService commonOrderService;

	
	


   /**

    * 通过邀请码获取用户信息

@@ -169,6 +182,8 @@
         return;

      }

      String phoneNumber = WXXCXUtil.getPhoneNumber(sessionKey, phoneEncryptedData, phoneIv);

      LogHelper.test("小程序获取到的电话号码为:"+phoneNumber);

		
      if (StringUtil.isNullOrEmpty(phoneNumber)) {

         out.print(JsonUtil.loadFalseResult("获取电话号码失败"));

         return;

@@ -542,8 +557,27 @@
      list.add(BanLiShopOrder.STATE_SUCCESS);

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



      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

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

//      vo.setFinishTeam(hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

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

		
      int finishTeam = 0;

      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 = commonOrderService.countOrderByUidAndSettled(worker.getId(),  payMoney);

            if (countValid > 0) {

               finishTeam ++;

            }

         }

      }

      vo.setFinishTeam(finishTeam);

		
      vo.setFinishHongBao(banLiShopOrderService.countByUidAndState(uid, list));



      // 区分老用户和新用户

@@ -605,57 +639,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"));



      long finishTeam = hongBaoV2CountService.countValidOrderTeamUserByUid(uid,

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

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



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

@@ -668,9 +652,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("申请成功，正在受理中"));

      }

   }