Merge remote-tracking branch 'origin/master'

admin

2019-07-09 b5624f9e80d4fa8d9bb42f759b47f8059ba6a0eb

 fanli/src/main/java/com/yeshi/fanli/service/impl/activity/ActivityUserServiceImpl.java

@@ -91,4 +91,17 @@
      activityRuleUserMapper.updateByPrimaryKeySelective(au);

   }



   @Override

   public ActivityUser getRandomByDaTaoKeCid(int cid) {

      int ruleId = 100 + cid;

      List<ActivityRuleUser> ruleList = activityRuleUserMapper.listByRuleCode(ruleId, 0, 100);

      return ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

   }



   @Override

   public ActivityUser getRandomHaoHuo() {

      List<ActivityRuleUser> ruleList = activityRuleUserMapper.listByRuleCode(ActivityRuleUser.RULE_HAOHUO, 0, 100);

      return ruleList.get((int) (ruleList.size() * Math.random())).getActivityUser();

   }



}