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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/TeamFansInfoServiceImpl.java

@@ -19,6 +19,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserActiveLogService;
@@ -37,68 +38,72 @@

   @Resource
   private TeamFansInfoDao teamFansInfoDao;
	

   @Resource
   private ThreeSaleSerivce threeSaleSerivce;
	

   @Resource
   private  UserInfoService userInfoService;
	
   private UserInfoService userInfoService;

   @Resource
   private UserInfoExtraService userInfoExtraService;
	

   @Resource
   private ThreeSaleExtraInfoSerivce threeSaleExtraInfoSerivce;
	

   @Resource
   private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
	

   @Resource
   private HongBaoV2CountService hongBaoV2CountService;
	

   @Resource
   private UserInviteService userInviteService;
	

   @Resource
   private CommonOrderService commonOrderService;
	

   @Resource
   private UserActiveLogService userActiveLogService;

	
	
	
   @Override
   public void save(TeamFansInfo record) {
      if (record == null || record.getWorkerId() == null ) {
      if (record == null || record.getWorkerId() == null) {
         return;
      }
      record.setId(record.getWorkerId().toString());
      
      // 无邀请关系 不操作
      ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(record.getWorkerId());
      if (threeSale == null)
         return;

      record.setId(record.getWorkerId().toString());

      TeamFansInfo teamFansInfo = teamFansInfoDao.get(record.getId());
      if (teamFansInfo != null) {
         teamFansInfoDao.updateSelective(record);
         LogHelper.test("队员粉丝信息:更新-" + record.getId());
      } else {
         initData(record);
         record.setUpdateTime(new Date());
         record.setCrateTime(new Date());
         LogHelper.test("队员粉丝信息:新增-" + record.getId());
         teamFansInfoDao.save(record);
      }
   }
	
	

   /**
    * 初始化数据
    * @param record
    */
   private void initData(TeamFansInfo record) {
      if (StringUtil.isNullOrEmpty(record.getNickName()))
          record.setNickName("");
         record.setNickName("");
      if (record.getLevel() == null)
          record.setLevel(UserLevelEnum.daRen);
         record.setLevel(UserLevelEnum.daRen);
      if (record.getStateValid() == null)
         record.setStateValid(false);
      if (record.getTaobaoBind() == null)
          record.setTaobaoBind(false);
         record.setTaobaoBind(false);
      if (record.getWeixinId() == null)
         record.setWeixinId("");
      if (record.getPhone() == null)
@@ -123,17 +128,17 @@
         record.setMemoNameSup("");
      if (record.getTagsSup() == null)
         record.setTagsSup("");
		

      if (StringUtil.isNullOrEmpty(record.getWeixinId())) {
         record.setWeixinIdExist(false);
      } else {
         record.setWeixinIdExist(true);
      }
			

   }
	

   @Override
   public void addFansInfo(Long workerId, Long bossId) {
   public void addFansInfo(Long workerId, Long bossId, Date successTime) {
      UserInfo userInfo = userInfoService.selectByPKey(workerId);
      if (userInfo == null) {
         return;
@@ -146,8 +151,7 @@

      // 备注名
      String memoName = null;
      ThreeSaleExtraInfo threeSaleExtraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(bossId,
            workerId);
      ThreeSaleExtraInfo threeSaleExtraInfo = threeSaleExtraInfoSerivce.getbyBossIdAndWorkerId(bossId, workerId);
      if (threeSaleExtraInfo != null) {
         if (!StringUtil.isNullOrEmpty(threeSaleExtraInfo.getNickname())) {
            memoName = threeSaleExtraInfo.getNickname();
@@ -228,6 +232,7 @@
      focusInfo.setBossId(bossId);
      focusInfo.setWorkerId(workerId);
      focusInfo.setBossSuperId(bossSuperId);
      focusInfo.setJoinTime(successTime);
      focusInfo.setNickName(userInfo.getNickName());
      focusInfo.setMemoName(memoName);
      focusInfo.setWeixinIdExist(weixinBind);
@@ -245,11 +250,7 @@
      focusInfo.setId(workerId.toString());
      save(focusInfo);
   }
	
	
	
	
	

   @Override
   public void updateMemoName(Long workerId, int type, String memoName) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -261,8 +262,7 @@
      }
      save(teamFansInfo);
   }
	
	

   @Override
   public void updateTags(Long workerId, int type, String tags) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -274,8 +274,7 @@
      }
      save(teamFansInfo);
   }
	
	

   @Override
   public void updateNickName(Long workerId, String nickName) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -283,8 +282,7 @@
      teamFansInfo.setNickName(nickName);
      save(teamFansInfo);
   }
	
	

   @Override
   public void updateStateValid(Long workerId, boolean stateValid) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -292,7 +290,7 @@
      teamFansInfo.setStateValid(stateValid);
      save(teamFansInfo);
   }
	

   @Override
   public void updateTaobaoBind(Long workerId, boolean taobaoBind) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -300,7 +298,7 @@
      teamFansInfo.setTaobaoBind(taobaoBind);
      save(teamFansInfo);
   }
	

   @Override
   public void updateActiveTime(Long workerId, Date activeTime) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -309,7 +307,6 @@
      save(teamFansInfo);
   }

	
   @Override
   public void updateWeixinId(Long workerId, String weixinId) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -322,8 +319,7 @@
      }
      save(teamFansInfo);
   }
	
	

   @Override
   public void updateInviteCode(Long workerId, String inviteCode) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -331,7 +327,7 @@
      teamFansInfo.setInviteCode(inviteCode);
      save(teamFansInfo);
   }
	

   @Override
   public void updatePhone(Long workerId, String phone) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -339,7 +335,7 @@
      teamFansInfo.setPhone(phone);
      save(teamFansInfo);
   }
	

   @Override
   public void updateLevel(Long workerId, UserLevelEnum level) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -347,7 +343,7 @@
      teamFansInfo.setWorkerId(workerId);
      save(teamFansInfo);
   }
	

   @Override
   public void updatePhoneOpen(Long workerId, boolean phoneOpen) {
      TeamFansInfo teamFansInfo = new TeamFansInfo();
@@ -355,21 +351,20 @@
      teamFansInfo.setPhoneOpen(phoneOpen);
      save(teamFansInfo);
   }
	
	

   @Override
   public void updateIncome(Long workerId, BigDecimal income) {
      if (income == null) {
         income = BigDecimal.ZERO;
      }
		

      TeamFansInfo teamFansInfo = new TeamFansInfo();
      teamFansInfo.setWorkerId(workerId);
      teamFansInfo.setIncome(income.multiply(BigDecimal.valueOf(100)).setScale(0, BigDecimal.ROUND_DOWN).intValue());
      teamFansInfo.setIncomeTime(new Date());
      save(teamFansInfo);
   }
	

   @Override
   public void updateFansNum(Long workerId) {
      long firstTeam = threeSaleSerivce.countFirstTeam(workerId);
@@ -380,18 +375,17 @@
      teamFansInfo.setFansNum(fansNum);
      save(teamFansInfo);
   }
	
	

   @Override
   public List<TeamFansInfo> query(int start, int count, int type, Long uid, ThreeSaleFocusDTO focusDTO) {
      return teamFansInfoDao.query(start, count, type, uid, focusDTO);
   }
	

   @Override
   public long count(int type, Long uid, ThreeSaleFocusDTO focusDTO) {
      return teamFansInfoDao.count(type, uid, focusDTO);
   }
	

   @Override
   public TeamFansInfo getbyWorkerId(Long workerId) {
      return teamFansInfoDao.getbyWorkerId(workerId);