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

yujian

2019-12-07 1fd8f11537bb74c1f7e611e35a766cbbd34eff05

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java

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


import javax.annotation.Resource;



import org.apache.ibatis.annotations.Param;

import org.springframework.stereotype.Service;

import org.yeshi.utils.DateUtil;



@@ -238,6 +239,11 @@
   public int getTotalTiChengCount(Long uid) {

      return hongBaoV2CountMapper.getTotalTiChengCount(uid);

   }

	
   @Override

   public long getHongBaoCount(Long uid,Integer type) {

      return hongBaoV2CountMapper.getHongBaoCount(uid, type);

   }



   @Override

   public long countValidNumberByUid(Long uid, Integer dateType) {

@@ -334,7 +340,20 @@
   }

   

   @Override

   public long countValidOrderTeamUserByUid(Long uid, String date, BigDecimal payment) {

      return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, date, payment);

   public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {

      return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);

   }

	
   @Override

   public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType) {

      return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null);

   }

	
	
   @Override

   public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState, String orderNo, Integer source, String startTime,  String endTime) {

      return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, source,

            startTime, endTime);

   }

	
}