|
@@ -2,6 +2,7 @@ package com.game.business.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
|
+import com.game.business.domain.AppGame;
|
|
import com.game.business.domain.AppGameItem;
|
|
import com.game.business.domain.AppGameItem;
|
|
import com.game.business.domain.AppGameItemMultiple;
|
|
import com.game.business.domain.AppGameItemMultiple;
|
|
import com.game.business.domain.AppGameLottery;
|
|
import com.game.business.domain.AppGameLottery;
|
|
@@ -12,6 +13,7 @@ import com.game.business.service.IAppGameLotteryService;
|
|
import com.game.business.service.IAppGameService;
|
|
import com.game.business.service.IAppGameService;
|
|
import com.game.business.task.AppGameBettingTask;
|
|
import com.game.business.task.AppGameBettingTask;
|
|
import com.game.business.task.AppGameLotteryTask;
|
|
import com.game.business.task.AppGameLotteryTask;
|
|
|
|
+import com.game.business.util.Common;
|
|
import com.game.business.vo.AppGameLotteryVO;
|
|
import com.game.business.vo.AppGameLotteryVO;
|
|
import com.game.business.vo.AppUserAgentVO;
|
|
import com.game.business.vo.AppUserAgentVO;
|
|
import com.game.common.annotation.Anonymous;
|
|
import com.game.common.annotation.Anonymous;
|
|
@@ -77,6 +79,12 @@ public class AppGameLotteryController extends BaseController{
|
|
List<AppGameLotteryVO> resultList = new ArrayList<>();
|
|
List<AppGameLotteryVO> resultList = new ArrayList<>();
|
|
|
|
|
|
if(list != null && !list.isEmpty()) {
|
|
if(list != null && !list.isEmpty()) {
|
|
|
|
+
|
|
|
|
+ AppGame appGame = appGameService.selectAppGameById(gameId);
|
|
|
|
+ if(appGame == null){
|
|
|
|
+ return HttpRetPageArr.fail("查询失败,游戏不存在");
|
|
|
|
+ }
|
|
|
|
+
|
|
AppGameItem appGameItem = new AppGameItem();
|
|
AppGameItem appGameItem = new AppGameItem();
|
|
appGameItem.setGameId(gameId);
|
|
appGameItem.setGameId(gameId);
|
|
List<AppGameItem> itemList = appGameItemService.selectAppGameItemList(appGameItem);
|
|
List<AppGameItem> itemList = appGameItemService.selectAppGameItemList(appGameItem);
|
|
@@ -92,9 +100,11 @@ public class AppGameLotteryController extends BaseController{
|
|
String itemMultiple = "";
|
|
String itemMultiple = "";
|
|
List<String> multipleList = new ArrayList<>();
|
|
List<String> multipleList = new ArrayList<>();
|
|
|
|
|
|
- AppGameItemMultiple appGameItemMultiple = appGameItemMultipleService.getAppGameItemMultiple(appGameLottery.getGameId(), appGameLottery.getGameDate());
|
|
|
|
- if(appGameItemMultiple != null){
|
|
|
|
- multipleList = Arrays.asList(appGameItemMultiple.getItemMultiple().split(","));
|
|
|
|
|
|
+ if(appGame.getCode().equals(Common.GAME_ONE_CODE)){
|
|
|
|
+ AppGameItemMultiple appGameItemMultiple = appGameItemMultipleService.getAppGameItemMultiple(appGameLottery.getGameId(), appGameLottery.getGameDate());
|
|
|
|
+ if(appGameItemMultiple != null){
|
|
|
|
+ multipleList = Arrays.asList(appGameItemMultiple.getItemMultiple().split(","));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
String [] itmeArr = appGameLotteryVO.getGameLotterySucc().split(",");
|
|
String [] itmeArr = appGameLotteryVO.getGameLotterySucc().split(",");
|