yujian
2020-04-27 77cd7f9358cc62d70249a78ee33c7626d4bdc5b5
fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserAccountControllerV2.java
@@ -45,6 +45,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;
@@ -203,6 +204,9 @@
   
   @Resource
   private UserInviteValidNumService userInviteValidNumService;
   @Resource
   private CommonOrderService commonOrderService;
   
   
   /**
@@ -473,7 +477,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 ++;
            }
@@ -682,7 +686,19 @@
      json.put("earnMoney", earnMoney);
      
      json.put("tearcherTip", "我是你的导师,为你在省赚过程中解难答疑,对你一对一辅导,倾听你的需求总结并反馈给板栗快省官方运营团队,快来添加我吧。");
      json.put("tearcherWX", userVipConfigService.getValueByKey("tearcher_weixin_num"));
      String tearcherWX = "";
      String wxs = userVipConfigService.getValueByKey("tearcher_weixin_num");
      if (!StringUtil.isNullOrEmpty(wxs)) {
         String[] array = wxs.split(",");
         if (array != null && array.length > 0) {
            int pos = (int) (Math.random() * array.length);
            tearcherWX = array[pos];
         }
      }
      json.put("tearcherWX", tearcherWX);
      json.put("newerGongLue", configService.get(ConfigKeyEnum.newerGonglue.getKey()));
      
      // 已完成