From 0379c65f03ec6ccf27eebbdc72a25cabbda28e5a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:22:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 insertions(+), 4 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 a8aa092..bccc7ab 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);
}
@@ -375,7 +374,27 @@
@RequestMapping("/pre_add")
public String add(Model model) {
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+
+ model.addAttribute("is3","true");
+ model.addAttribute("storeId",UserExt.getUser().getObjectId());
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ model.addAttribute("cityCode",byId.getCityCode());
+ model.addAttribute("provinceCode",byId.getProvinceCode());
+ model.addAttribute("oId",byId.getOperatorId());
+ return PREFIX+"ball_pre_add1.html";
+
+ }else {
+ model.addAttribute("is3","false");
+ }
+
+
+
model.addAttribute("is","${is}");
+
+
return PREFIX+"ball_pre_add.html";
}
@@ -391,6 +410,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);
@@ -425,6 +450,18 @@
model.addAttribute("ly",ly);
+ Integer objectType = UserExt.getUser().getObjectType();
+
+ if (objectType ==3){
+ model.addAttribute("is3","true");
+ model.addAttribute("storeId",UserExt.getUser().getObjectId());
+ TStore byId = storeService.getById(UserExt.getUser().getObjectId());
+ model.addAttribute("cityCode",byId.getCityCode());
+ model.addAttribute("provinceCode",byId.getProvinceCode());
+ model.addAttribute("oId",byId.getOperatorId());
+ return PREFIX+"ball_pre_edit1.html";
+
+ }
return PREFIX+"ball_pre_edit.html";
}
@@ -437,6 +474,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);
@@ -898,9 +942,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