From ca4b083c5f719e6aabe1b1ea7efdd244a95f7709 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期四, 26 十月 2023 15:08:37 +0800
Subject: [PATCH] 10.26.4
---
cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html | 2
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java | 15 +++++
cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html | 3 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 24 ++++++--
cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java | 6 -
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java | 53 +++++++++++------
cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java | 30 +++++-----
7 files changed, 88 insertions(+), 45 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
index cf5625e..cae2ee6 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseStudentController.java
@@ -746,6 +746,8 @@
System.out.println("保存成功=============》="+holi);
+
+
TCoursePackage tCoursePackage = packageService.getById(toHoliDto.getClassId());
String classWeeks = tCoursePackage.getClassWeeks();
List<Integer> week = week(classWeeks);
@@ -870,10 +872,6 @@
String join = StringUtils.join(stringArray, ",");
System.out.println("==========join========"+join);
return "转课成功";
-
-
-
-
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
index a3fda90..1a70bab 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java
@@ -35,6 +35,7 @@
import com.dsh.course.model.vo.RegisterCourseVo;
import com.dsh.course.model.vo.request.*;
import com.dsh.course.model.vo.response.*;
+import com.dsh.course.service.CoursePackageSchedulingService;
import com.dsh.course.service.ICoursePackageSchedulingService;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.util.*;
@@ -731,6 +732,7 @@
}
+
@Override
public List<RecordAppoint> obtainStuClassDetails(Integer stuId, Integer appUserId,Integer pageNum) {
@@ -752,8 +754,8 @@
if (tCoursePackagePayments.size() > 0 ){
// int pageNum = 1; // 页码
- int pageSize = 10; // 每页记录数
- Page<CoursePackageStudent> page = new Page<>(pageNum, pageSize);
+ int pageSize = 5; // 每页记录数
+ Page<CoursePackageStudent> page = new Page<>(1, pageSize);
// for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
// List<CoursePackageStudent> coursePackageStudent1 = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
@@ -796,9 +798,19 @@
// recordVo.setCourseHours(tCoursePackagePayment.getClassHours());
Date date = DateUtil.getDate();
- String classStartTime = coursePackage.getClassStartTime();
- String classEndTime = coursePackage.getClassEndTime();
- recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);
+
+ CoursePackageScheduling byId = coursePackageSchedulingService.getById(coursePackageStudent.getCoursePackageSchedulingId());
+// String classStartTime = coursePackage.getClassStartTime();
+// String classEndTime = coursePackage.getClassEndTime();
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ String dateString1 = sdf.format(byId.getClassDate());
+ String dateString2 = sdf.format(byId.getEndDate());
+
+
+ recordVo.setTimeFrame(dateString1 + "-" + dateString2.substring(11));
+
+// recordVo.setTimeFrame(simpleDateFormat.format(date)+" "+classStartTime+"-"+classEndTime);
Store store = stoClient.queryStoreById(coursePackage.getStoreId());
recordVo.setStoreNameAddr(store.getName()+store.getAddress());
recordVo.setCourseStuRecordId(coursePackageStudent.getId());
@@ -807,7 +819,7 @@
List<String> integerList = Arrays.asList(split);
String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
if (integerList.contains(weekOfDate)){
- String dat = simpleDateFormat.format(date) +" "+ classStartTime;
+ String dat = simpleDateFormat.format(date) +" "+ dateString2.substring(11);
Date start = null;
try {
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
index 10dde53..99c1429 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/AdvertisementController.java
@@ -189,6 +189,12 @@
@ResponseBody
@RequestMapping(value = "/addAdvertisement")
public ResultUtil addAdvertisement(@RequestBody Banner banner) {
+ if (banner.getType().equals("请选择")){
+ banner.setType(null);
+ }
+ if (banner.getPage().equals("请选择")){
+ banner.setPage(null);
+ }
banner.setInsertTime(new Date());
bannerClient.addAdvertisement(banner);
return ResultUtil.success("添加成功");
@@ -204,6 +210,15 @@
if (banner.getImg().equals("")||banner==null){
banner.setImg(byId.getImg());
}
+
+ if (banner.getType().equals("请选择")){
+ banner.setType(null);
+ }
+ if (banner.getPage().equals("请选择")){
+ banner.setPage(null);
+ }
+
+
bannerClient.updateAdvertisement(banner);
return ResultUtil.success("添加成功");
}
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 b7c5f3c..423bbaf 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
@@ -614,7 +614,12 @@
System.out.println("是否超过当前日期"+isAfterCurrentDate);
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
- String nextTime = getNextTime(currentTime);
+ String nextTime = null;
+ if("智慧场地".equals(site.getTypeName())){
+ nextTime=getNextTimeOne(currentTime);
+ }else {
+ nextTime= getNextTime(currentTime);
+ }
String timeRange = currentTime + "-" + nextTime;
@@ -989,7 +994,13 @@
String currentTime = appointmentStartTime;
while (currentTime.compareTo(appointmentEndTime) < 0) {
- String nextTime = getNextTime(currentTime);
+ String nextTime = null;
+ if("智慧场地".equals(site.getTypeName())){
+ nextTime=getNextTimeOne(currentTime);
+ }else {
+ nextTime= getNextTime(currentTime);
+ }
+// String nextTime = getNextTime(currentTime);
String timeRange = currentTime + "-" + nextTime;
@@ -1031,27 +1042,31 @@
return String.format("%02d:%02d", hour, minute);
-// String[] parts = currentTime.split(":");
-// int hour = Integer.parseInt(parts[0]);
-// int minute = Integer.parseInt(parts[1]);
-//
-// if (minute == 45) {
-// hour++;
-// minute = 0;
-// } else if (minute == 0){
-// minute = 15;
-// }else if (minute == 15){
-// minute = 30;
-// }else if (minute == 30){
-// minute = 45;
-// }
-//
-// return String.format("%02d:%02d", hour, minute);
-
}
+ public static String getNextTimeOne(String currentTime) {
+
+ String[] parts = currentTime.split(":");
+ int hour = Integer.parseInt(parts[0]);
+ int minute = Integer.parseInt(parts[1]);
+
+ if (minute == 45) {
+ hour++;
+ minute = 0;
+ } else if (minute == 0){
+ minute = 15;
+ }else if (minute == 15){
+ minute = 30;
+ }else if (minute == 30){
+ minute = 45;
+ }
+
+ return String.format("%02d:%02d", hour, minute);
+
+ }
+
@RequestMapping("/halfName/{id}")
@ResponseBody
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
index dfb3c18..bc2951e 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/yuyue.html
@@ -102,7 +102,7 @@
<#button name="修改" icon="fa-edit" clickFun="TStudent.openTStudentDetail()" space="true"/>
<#button name="确认到店" icon="fa-edit" clickFun="TStudent.openTStudentDetail1()" space="true"/>
- <#button name="取消凭证" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
+ <#button name="取消预约" icon="fa-edit" clickFun="TStudent.openTStudentDetail4()" space="true"/>
<#button name="手动支付" icon="fa-edit" clickFun="TStudent.openTStudentDetail6()" space="true"/>
<#button name="查看详情" icon="fa-edit" clickFun="TStudent.openTStudentDetail5()" space="true"/>
diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
index f83c8d8..377d70f 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add_two.html
@@ -142,6 +142,9 @@
});
ajax.set("id",oneId);
ajax.start();
+
+ updateT(document.getElementById("type"));
+
}
</script>
@}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
index 1fd14f0..daf6a85 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java
@@ -81,25 +81,25 @@
@ApiImplicitParam(value = "位置（1=首页，2=首页底部，3=线上课得积分，4=看视频得奖励，5=常见问题）", name = "position", dataType = "int", required = true),
})
public ResultUtil<List<BannerVo>> queryBannerList(Integer position){
- try {
- List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
+// try {
+// List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));
- if (position == 4) {
+// if (position == 4) {
List<BannerVo> list2 = bannerService.list1(position);
return ResultUtil.success(list2);
- }
+// }
- List<BannerVo> list1 = new ArrayList<>();
- for (Banner banner : list) {
- BannerVo bannerVo = new BannerVo();
- BeanUtils.copyProperties(banner, bannerVo);
- list1.add(bannerVo);
- }
- return ResultUtil.success(list1);
- }catch (Exception e){
- e.printStackTrace();
- return ResultUtil.runErr();
- }
+// List<BannerVo> list1 = new ArrayList<>();
+// for (Banner banner : list) {
+// BannerVo bannerVo = new BannerVo();
+// BeanUtils.copyProperties(banner, bannerVo);
+// list1.add(bannerVo);
+// }
+// return ResultUtil.success(list1);
+// }catch (Exception e){
+// e.printStackTrace();
+// return ResultUtil.runErr();
+// }
}
--
Gitblit v1.7.1