diff --git a/tutorials-2.6-1/src/main/java/cn/bugstack/design/DrawControl.java b/tutorials-2.6-1/src/main/java/cn/bugstack/design/DrawControl.java index 479c60b..e6376d6 100755 --- a/tutorials-2.6-1/src/main/java/cn/bugstack/design/DrawControl.java +++ b/tutorials-2.6-1/src/main/java/cn/bugstack/design/DrawControl.java @@ -1,7 +1,5 @@ package cn.bugstack.design; -import java.util.ArrayList; -import java.util.Collections; import java.util.List; /** @@ -16,8 +14,14 @@ public class DrawControl { private IDraw draw; - public List doDraw(IDraw draw, List betUserList, int count) { + public List doDraw(List betUserList, int count) { return draw.prize(betUserList, count); } + public DrawControl() { + } + + public DrawControl(IDraw draw) { + this.draw = draw; + } } diff --git a/tutorials-2.6-1/src/test/java/cn/bugstack/design/test/ApiTest.java b/tutorials-2.6-1/src/test/java/cn/bugstack/design/test/ApiTest.java index 1a1a9ef..b23ab06 100644 --- a/tutorials-2.6-1/src/test/java/cn/bugstack/design/test/ApiTest.java +++ b/tutorials-2.6-1/src/test/java/cn/bugstack/design/test/ApiTest.java @@ -25,11 +25,12 @@ public void test_DrawControl() { betUserList.add(new BetUser("笨笨", 89)); betUserList.add(new BetUser("丑蛋", 10)); - DrawControl drawControl = new DrawControl(); - List prizeRandomUserList = drawControl.doDraw(new DrawRandom(), betUserList, 3); + DrawControl drawControl = new DrawControl(new DrawRandom()); + List prizeRandomUserList = drawControl.doDraw(betUserList, 3); logger.info("随机抽奖,中奖用户名单:{}", JSON.toJSON(prizeRandomUserList)); - List prizeWeightUserList = drawControl.doDraw(new DrawWeightRank(), betUserList, 3); + drawControl = new DrawControl(new DrawWeightRank()); + List prizeWeightUserList = drawControl.doDraw(betUserList, 3); logger.info("权重抽奖,中奖用户名单:{}", JSON.toJSON(prizeWeightUserList)); }