From 12916db6e7946a31f4fbc5c48a27e7769683b034 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 23 十月 2023 18:25:02 +0800
Subject: [PATCH] 10.23
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
index fa6d95a..686451f 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java
@@ -182,7 +182,6 @@
@ResponseBody
public List<Game> changelist(BallQueryDto ballQueryDto) {
System.out.println("=======ballQueryDto=========="+ballQueryDto);
-
return ballClient.list(ballQueryDto);
}
@@ -391,6 +390,12 @@
System.out.println("---------game------"+game);
model.addAttribute("game",game);
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
model.addAttribute("kc",kc);
@@ -437,6 +442,13 @@
System.out.println("---------game------"+game);
model.addAttribute("game",game);
+
+ if (game.getOperationId() ==0){
+ model.addAttribute("opId","平台");
+ model.addAttribute("is","平台");
+ }else {
+ model.addAttribute("opId",game.getOperationId());
+ }
TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
model.addAttribute("kc",kc);
@@ -817,9 +829,10 @@
@RequestMapping("/addjs")
@ResponseBody
- public void addjs( @RequestBody JsDto jsDto) {
+ public ResultUtil addjs( @RequestBody JsDto jsDto) {
System.out.println("=======jsDto========"+jsDto);
storeService.insert(jsDto);
+ return new ResultUtil(0,0,"保存成功",null,null);
}
@@ -897,9 +910,9 @@
LocalTime targetTime = LocalTime.parse(currentTime);
boolean hasExceeded = currentTime1.isAfter(targetTime);
-// if (hasExceeded){
-// orderDto.setState(0);
-// }
+ if (hasExceeded){
+ orderDto.setState(0);
+ }
if (strings.contains(timeRange)){
orderDto.setState(0);
}
--
Gitblit v1.7.1