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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

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

@@ -30,6 +30,7 @@
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.UserVIPInfo;

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

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

@@ -45,6 +46,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;

@@ -72,6 +74,7 @@
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.UserVipConfigService;

import com.yeshi.fanli.util.Constant;

@@ -203,6 +206,12 @@
   

   @Resource

   private UserInviteValidNumService userInviteValidNumService;

	
   @Resource

   private CommonOrderService commonOrderService;

	
   @Resource

   private TearcherService tearcherService;

   

   

   /**

@@ -473,7 +482,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 ++;

            }

@@ -681,8 +690,13 @@
      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("tearcherWX", userVipConfigService.getValueByKey("tearcher_weixin_num"));

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

      

      // 已完成

@@ -703,6 +717,24 @@
      // 人工客服链接

      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 {