From 4e8f5527259801d18b02f98d38bfe23eb2afc558 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 18 十月 2023 09:48:10 +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 | 83 +++++++++++++++++++++++++++++++++--------
1 files changed, 66 insertions(+), 17 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 6c7ba02..a8aa092 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
@@ -14,6 +14,7 @@
import com.dsh.course.feignClient.course.CoursePackageDiscountClient;
import com.dsh.course.feignClient.course.CoursePackagePaymentConfigClient;
import com.dsh.course.feignClient.course.CoursePackageTypeClient;
+import com.dsh.course.feignClient.course.model.TCoursePackage;
import com.dsh.course.feignClient.course.model.TCoursePackageType;
import com.dsh.course.feignClient.other.BallClient;
import com.dsh.course.feignClient.other.SiteClient;
@@ -40,10 +41,7 @@
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.Base64Utils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.io.BufferedReader;
@@ -188,6 +186,18 @@
return ballClient.list(ballQueryDto);
}
+ @ResponseBody
+ @PostMapping("/editCoursePackageState")
+ public ResultUtil editCoursePackageState(Integer id, Integer state){
+ Game game = new Game();
+ game.setId(id);
+ game.setState(state);
+ ballClient.save(game);
+
+ return ResultUtil.success();
+ }
+
+
@RequestMapping("/save")
@ResponseBody
public ResultUtil save(Integer id, String operationId, String red, String blue, String province, String city, Integer site, Integer store
@@ -202,14 +212,11 @@
, String zs2, BigDecimal zs2Coin, BigDecimal zs2Cash, String zs2Image, BigDecimal zs2Int, Integer zs2Id,Integer zs2IId
, String ly, BigDecimal lyCoin, BigDecimal lyCash, String lyImage, BigDecimal lyInt, Integer lyId,Integer lyIId
-
-
-
-
) {
Game game = new Game();
game.setRed(red);
+ game.setState(0);
game.setBlue(blue);
game.setProvinceCode(province);
game.setCityCode(city);
@@ -422,6 +429,52 @@
return PREFIX+"ball_pre_edit.html";
}
+
+ @RequestMapping("/pre_info/{id}")
+ public String pre_info(@PathVariable("id") Integer id,Model model) {
+
+ Game game = ballClient.queryGame(id);
+ System.out.println("---------game------"+game);
+ model.addAttribute("game",game);
+
+
+ TGameConfig kc = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 14));
+ model.addAttribute("kc",kc);
+
+
+ TGameConfig sq = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 16));
+ model.addAttribute("sq",sq);
+
+
+ TGameConfig sm = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 13));
+ model.addAttribute("sm",sm);
+
+ TGameConfig sd = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 15));
+ model.addAttribute("sd",sd);
+
+ TGameConfig fk = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 1));
+ model.addAttribute("fk",fk);
+
+ TGameConfig jx = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 7));
+ model.addAttribute("jx",jx);
+
+ TGameConfig qw = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 8));
+ model.addAttribute("qw",qw);
+
+ TGameConfig zs = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 10));
+ model.addAttribute("zs",zs);
+
+ TGameConfig zs2 = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 11));
+ model.addAttribute("zs2",zs2);
+
+ TGameConfig ly = gameConfigService.getOne(new QueryWrapper<TGameConfig>().eq("otherId", id).eq("gameId", 5));
+ model.addAttribute("ly",ly);
+
+
+
+ return PREFIX+"ball_pre_info.html";
+ }
+
@Autowired
private ISiteBookingService iSiteBookingService;
@@ -463,8 +516,6 @@
List<OrderDto> timeRanges = new ArrayList<>();
-
-
Site site = siteClient.listById(book.getSiteId());
System.out.println("================"+site);
String appointmentStartTime = site.getAppointmentStartTime();
@@ -503,9 +554,6 @@
if (strings1.contains(timeRange)){
orderDto.setState(1);
}
-
-
-
timeRanges.add(orderDto);
currentTime = nextTime;
@@ -769,9 +817,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);
}
@@ -849,9 +898,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