积分相关

yujian

2019-08-09 41aec48fb1e43f42807b1c71c9aeb19ebbf7506c

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/ThreeSaleSerivceImpl.java

@@ -8,7 +8,6 @@


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.core.task.TaskExecutor;

import org.springframework.stereotype.Service;

import org.springframework.transaction.annotation.Transactional;

@@ -19,6 +18,7 @@
import com.yeshi.fanli.entity.bus.user.ThreeSaleExtraInfo;

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

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

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

import com.yeshi.fanli.exception.ThreeSaleException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;

@@ -27,6 +27,7 @@
import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService;

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

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

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -62,6 +63,9 @@
   

   @Resource

   private UserActiveLogService userActiveLogService;

	
   @Resource

   private UserInfoExtraService userInfoExtraService;

   

   @Resource(name = "taskExecutor")

   private TaskExecutor executor;

@@ -352,7 +356,7 @@


      long countTotal = threeSaleMapper.countFirstTeam(uid, state);



      return organizeTeam(countTotal, list);

      return organizeTeam(countTotal, list, uid);

   }



   @Override

@@ -364,10 +368,10 @@


      long countTotal = threeSaleMapper.countSecondTeam(uid, state);



      return organizeTeam(countTotal, list);

      return organizeTeam(countTotal, list, uid);

   }



   public JSONObject organizeTeam(long count, List<ThreeSale> list) {

   public JSONObject organizeTeam(long count, List<ThreeSale> list, Long uid) {



      JSONObject result = new JSONObject();



@@ -398,15 +402,18 @@
         object.put("memoName", memoName);



         String nickName = "";

         Long  workerId= null;

         String portrait = "";

         Long lastLoginTime = null;



         UserInfo worker = threeSale.getWorker();

         if (worker != null) {

            workerId = worker.getId();

            portrait = worker.getPortrait();

            lastLoginTime = worker.getLastLoginTime();

            nickName = worker.getNickName();

         }

         object.put("workerId", workerId);

         object.put("nickName", nickName);

         object.put("portrait", portrait);



@@ -431,8 +438,15 @@
               // 往年

               contentJson.put("content", "最近登录 " + format.format(lastLoginTime));

            }



            array.add(contentJson);

				
				
            if (workerId != null) {

               UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(workerId);

               if (userInfoExtra != null) 
                  object.put("weiXin", userInfoExtra.getWeiXin());

            }

				


         } else if (threeSale.getExpire() != null

               && (threeSale.getExpire() == 1 || threeSale.getExpire().equals(1))) {

@@ -476,6 +490,12 @@
         resultArray.add(object);

      }



      boolean bdWeiXin = false;

      UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

      if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getWeiXin())) 
         bdWeiXin = true;

		
      result.put("bdWeiXin", bdWeiXin);

      result.put("count", count);

      result.put("result_list", resultArray);