From e99324b70510afdff4175a484e976cb0e804411b Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 25 九月 2023 16:18:45 +0800
Subject: [PATCH] 9.25
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java | 163 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 151 insertions(+), 12 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
index fcef6e6..d7a784b 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCoursePackageController.java
@@ -28,6 +28,9 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -144,7 +147,9 @@
List<Coach> coaches = coachClient.queryCoachByCity(code1);
model.addAttribute("coach", coaches);
-// System.out.println("========type========"+type);
+
+ model.addAttribute("type",type);
+ System.out.println("========type========"+type);
// if (type ==1){
// return PREFIX + "coursePackage_edit.html";
// }
@@ -162,6 +167,36 @@
public String openEditCoursePackage(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ model.addAttribute("type", tCoursePackage.getType());
+
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+
+ if (tCoursePackage.getStartTime()!=null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = sdf.format(tCoursePackage.getStartTime());
+ String dateString1 = sdf.format(tCoursePackage.getEndTime());
+ model.addAttribute("holi", dateString + " - " + dateString1);
+ }
+ String[] split1 = classStartTime.split(",");
+ String[] split2 = classEndTime.split(",");
+
+ List<String> listtime = new ArrayList<>();
+
+ for (int i = 0; i < split1.length; i++) {
+ String o = split1[i]+"-"+split2[i];
+ listtime.add(o);
+ }
+
+
+ model.addAttribute("time1",listtime.remove(0));
+ if (listtime.size()!=0) {
+ model.addAttribute("times", listtime);
+ }
+
+
+
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -193,10 +228,17 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+
+
System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
model.addAttribute("couponIds", list4.get(0).getCouponIds());
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
+ for (int i = 0; i < list4.size(); i++) {
+ list4.get(i).setId(i+2);
+ }
+
model.addAttribute("coursePackagePaymentConfigs", list4);
+ model.addAttribute("index", 1);
CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
// if (list4.size()!=0) {
model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
@@ -218,6 +260,36 @@
public String showCoursePackageDetails(Model model, Integer id){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
+ model.addAttribute("type", tCoursePackage.getType());
+
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+
+ if (tCoursePackage.getStartTime()!=null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String dateString = sdf.format(tCoursePackage.getStartTime());
+ String dateString1 = sdf.format(tCoursePackage.getEndTime());
+ model.addAttribute("holi", dateString + " - " + dateString1);
+ }
+ String[] split1 = classStartTime.split(",");
+ String[] split2 = classEndTime.split(",");
+
+ List<String> listtime = new ArrayList<>();
+
+ for (int i = 0; i < split1.length; i++) {
+ String o = split1[i]+"-"+split2[i];
+ listtime.add(o);
+ }
+
+
+ model.addAttribute("time1",listtime.remove(0));
+ if (listtime.size()!=0) {
+ model.addAttribute("times", listtime);
+ }
+
+
+
+
model.addAttribute("classTime", tCoursePackage.getClassStartTime() + ":00 - " + tCoursePackage.getClassEndTime() + ":00");
String[] split = tCoursePackage.getClassWeeks().split(";");
List<String> list5 = Arrays.asList("周一", "周二", "周三", "周四", "周五", "周六", "周日");
@@ -249,12 +321,24 @@
List<Coach> coaches = coachClient.queryCoachByCity(cityCode);
model.addAttribute("coach", coaches);
List<CoursePackagePaymentConfig> list4 = coursePackagePaymentConfigClient.queryCoursePackagePaymentConfigList(id);
+
+
+ System.out.println("========couponIds=========>"+list4.get(0).getCouponIds());
+ model.addAttribute("couponIds", list4.get(0).getCouponIds());
model.addAttribute("coursePackagePaymentConfig", list4.remove(0));
+ for (int i = 0; i < list4.size(); i++) {
+ list4.get(i).setId(i+2);
+ }
+
model.addAttribute("coursePackagePaymentConfigs", list4);
+ model.addAttribute("index", 1);
CoursePackagePaymentConfig coursePackagePaymentConfig = list4.get(0);
+// if (list4.size()!=0) {
model.addAttribute("cashPayment", coursePackagePaymentConfig.getCashPayment() == 0 ? false : true);
model.addAttribute("playPaiCoin", coursePackagePaymentConfig.getPlayPaiCoin() == 0 ? false : true);
-// model.addAttribute("couponIds", coursePackagePaymentConfig.getCouponIds());
+ System.out.println("=========coursePackagePaymentConfig=============>" + coursePackagePaymentConfig);
+// model.addAttribute("couponIds", "3,2");
+// }
return PREFIX + "coursePackage_info.html";
}
@@ -314,7 +398,12 @@
model.addAttribute("index",id);
model.addAttribute("conpund",conpunids);
- return PREFIX + "TCouponEdit.html";
+
+ if (conpunids!=null){
+ return PREFIX + "TCoupon1.html";
+ }
+
+ return PREFIX + "TCoupon.html";
}
/**
@@ -324,10 +413,19 @@
* @return
*/
@GetMapping("/registrationRecord")
- public String registrationRecord(Model model, Integer id){
+ public String registrationRecord(Model model, Integer id,Integer type){
TCoursePackage tCoursePackage = coursePackageService.queryById(id);
model.addAttribute("item", tCoursePackage);
- return PREFIX + "registrationRecord.html";
+ model.addAttribute("type", type);
+ if (type ==1){
+ return PREFIX + "registrationRecord.html";}
+ if (type == 2){
+ return PREFIX + "registrationRecord2.html";
+ }
+ if (type == 3){
+ return PREFIX + "registrationRecord3.html";
+ }
+ return "registrationRecord.html";
}
@@ -552,9 +650,24 @@
*/
@ResponseBody
@PostMapping("/addCoursePackage")
- public ResultUtil addCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
+ public ResultUtil addCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig) throws ParseException {
String classStartTime = coursePackage.getClassStartTime();
// String classEndTime = coursePackage.getClassEndTime();
+ Date startDate = null;
+ Date endDate =null ;
+
+ String holitime = coursePackage.getHolitime();
+ if (holitime!=null&&holitime!="") {
+ String[] dateParts = holitime.split(" - ");
+ String startDateString = dateParts[0];
+ String endDateString = dateParts[1];
+
+ DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ startDate = dateFormat.parse(startDateString);
+ endDate = dateFormat.parse(endDateString);
+
+ }
+
System.out.println("=======getClassStartTime============"+classStartTime);
String startTime = coursePackage.getClassStartTime();
@@ -579,6 +692,10 @@
System.out.println("=========secondString========>"+secondString);
// classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
// classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
+
+ coursePackage.setStartTime(startDate);
+ coursePackage.setEndTime(endDate);
+
coursePackage.setClassStartTime(firstString);
coursePackage.setClassEndTime(secondString);
coursePackage.setAuditStatus(1);
@@ -599,12 +716,34 @@
@ResponseBody
@PostMapping("/updateCoursePackage")
public ResultUtil updateCoursePackage(TCoursePackage coursePackage, String coursePackagePaymentConfig){
- String classStartTime = coursePackage.getClassStartTime();
- String classEndTime = coursePackage.getClassEndTime();
- classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
- classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
- coursePackage.setClassStartTime(classStartTime);
- coursePackage.setClassEndTime(classEndTime);
+
+// System.out.println("=======getClassStartTime============"+classStartTime);
+ String startTime = coursePackage.getClassStartTime();
+ JSONArray jsonArray = JSON.parseArray(startTime);
+ System.out.println("=======jsonArray==========="+jsonArray);
+
+ List<String> first = new ArrayList<>();
+ List<String> second = new ArrayList<>();
+ for (int i = 0; i < jsonArray.size(); i++) {
+// JSONObject jsonObject = JSON.parseObject(jsonArray.getString(i));
+
+ String jsonString = jsonArray.getString(i);
+ String[] split = jsonString.split("-");
+ first.add(split[0]);
+ second.add(split[1]);
+
+ }
+ String firstString = String.join(",",first);
+ String secondString = String.join(",",second);
+ System.out.println("=========firstString========>"+firstString);
+
+ System.out.println("=========secondString========>"+secondString);
+// String classStartTime = coursePackage.getClassStartTime();
+// String classEndTime = coursePackage.getClassEndTime();
+// classStartTime = classStartTime.substring(0, classStartTime.lastIndexOf(":"));
+// classEndTime = classEndTime.substring(0, classEndTime.lastIndexOf(":"));
+ coursePackage.setClassStartTime(firstString);
+ coursePackage.setClassEndTime(secondString);
coursePackageService.updateCoursePackage(coursePackage, coursePackagePaymentConfig);
return ResultUtil.success();
}
--
Gitblit v1.7.1