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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/ShamUserService.java

@@ -1,8 +1,8 @@
package com.yeshi.fanli.service.inter.user;



import java.math.BigDecimal;

import java.util.List;



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

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



/**

@@ -17,11 +17,6 @@


   public List<ShamUser> getAll();



   public List<HongBaoMessage> getManyData();



   public void delete(long id);



   public List<HongBaoMessage> findShamThreeSaleInfo();



   public List<ShamUser> findShamUserList(int sum);

   

@@ -39,4 +34,35 @@
   public int updateByPrimaryKey(ShamUser record);



   public List<ShamUser> listDistinctPicUrl(long start, int count);



   /**

    * 领券提示

    * @param count

    * @param smallTime

    * @param largeTime

    * @return

    */

   public List<ShamUser> listRandCouponUser(int count, int smallTime, int largeTime);



   /**

    * 分享奖金

    * @param count

    * 
    * @param shareMoney

    * @param small

    * @param large

    * @return

    */

   public List<ShamUser> listRandShareUser(int count, BigDecimal shareMoney, int small, int large);



   public int insertBatch(List<ShamUser> list);



   public int updateBatchSelective(List<ShamUser> list);



   /**

    * 随机一定的用户

    * @param count

    * @return

    */

   public List<ShamUser> listRandUser(int count);

}