Merge branch 'online1' of http://git.dayaedu.com/yonge/mec

mec-student/src/main/java/com/ym/mec/student/controller/LuckDrawController.java

@@ -62,22 +62,22 @@ public class LuckDrawController extends BaseController {
 
 	@ApiOperation(value = "抽奖")
 	@PostMapping(value = "/draw")
-	public Object draw(int group) {
+	public Object draw(Integer groupId) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		return succeed(luckDrawPrizeService.draw((long) sysUser.getId(), group));
+		return succeed(luckDrawPrizeService.draw((long) sysUser.getId(), groupId));
 	}
 
 	@ApiOperation(value = "查询个人抽奖机会")
 	@GetMapping(value = "/queryCount")
-	public Object queryCount() {
+	public Object queryCount(Integer groupId) {
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed("用户信息获取失败");
 		}
-		return succeed(luckDrawCountService.get((long) sysUser.getId()));
+		return succeed(luckDrawCountService.findByIdAndGroupId(sysUser.getId(),groupId));
 	}
 
 }