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

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/integral/IntegralTaskRecordMapper.java

@@ -1,6 +1,7 @@
package com.yeshi.fanli.dao.mybatis.integral;

import java.util.List;
import java.util.Set;

import org.apache.ibatis.annotations.Param;

@@ -16,6 +17,16 @@
    * @return
    */
   List<IntegralTaskRecord> listNotReceived(@Param("count") int count, @Param("uid") Long uid);
	
	
   /**
    * 未领取金币- 排除id
    * @param count
    * @param uid
    * @return
    */
   List<IntegralTaskRecord> listNotReceivedExcludeId(@Param("count") int count, @Param("uid") Long uid,
         @Param("list")Set<Long> idList);
   
   
   /**
@@ -44,5 +55,20 @@
    */
   List<IntegralTaskRecord> listDaySignRecord(@Param("uid") Long uid, @Param("cid") Long cid);
   
	
   /**
    * 未领取金币
    * @param count
    * @param uid
    * @return
    */
   int countTotalGoldCoin(@Param("uid") Long uid);
	
   /**
    * 更新领取状态
    * @param uid
    */
   void updateReceived(@Param("uid") Long uid);
	
}