Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-09-10 65460a2dc7c69d8c0e031ec4c89e25d47e5173f2

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

@@ -1,7 +1,5 @@
package com.yeshi.fanli.service.impl.hongbao;



import java.util.List;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;

@@ -48,8 +46,8 @@


   

   @Override

   public List<ThreeSaleExtraInfo> listbyBossIdAndWorkerId(Long bossId, Long workerId) {

      return threeSaleExtraInfoMapper.listbyBossIdAndWorkerId(bossId, workerId);

   public ThreeSaleExtraInfo getbyBossIdAndWorkerId(Long bossId, Long workerId) {

      return threeSaleExtraInfoMapper.getbyBossIdAndWorkerId(bossId, workerId);

   }

   

   @Override

@@ -58,6 +56,33 @@
   }

   

   

   @Override

   public boolean isRemindBoss(Long bossId, Long workerId) {

       ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoMapper.getbyBossIdAndWorkerId(bossId, workerId);

       if (extraInfo == null) {

          return false;

       }

		 
       Integer remindBoss = extraInfo.getRemindBoss();

       if (remindBoss == null || remindBoss != 1) {

          return false;

       }

       return true;

   }

	
   @Override

   public boolean isRemindWorker(Long bossId, Long workerId) {

       ThreeSaleExtraInfo extraInfo = threeSaleExtraInfoMapper.getbyBossIdAndWorkerId(bossId, workerId);

       if (extraInfo == null) {

          return false;

       }

		 
       Integer remindWorker = extraInfo.getRemindWorker();

       if (remindWorker == null || remindWorker != 1) {

          return false;

       }

       return true;

   }

   

   

}