From 8c55ab2701c99cec16eff92a26fefdf77fcdd28f Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:44 +0800
Subject: [PATCH] app接口修改
---
cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java | 1 +
cloud-server-course/src/main/java/com/dsh/course/model/vo/request/PayCourseReq.java | 2 +-
cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java | 2 ++
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 6 ------
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 15 ++++++++++++++-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 8 ++++----
cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java | 2 +-
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java | 2 +-
cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java | 6 +++---
9 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
index 2e5a5b4..0657af9 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/UseBenefitsController.java
@@ -86,6 +86,7 @@
}
TAppUser tAppUser = tauService.getBaseMapper().selectById(appUserId);
if (null != tAppUser){
+ detailsVo.setUserId(appUserId);
detailsVo.setUserImage(tAppUser.getHeadImg());
detailsVo.setUserName(tAppUser.getName());
detailsVo.setUserPhone(tAppUser.getPhone());
diff --git a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
index 1b7c970..12e5f6e 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/model/vo/userBenefitDetail/AppUserDetailsVo.java
@@ -7,6 +7,8 @@
@Data
public class AppUserDetailsVo {
+ private Integer userId;
+
@ApiModelProperty(value = "用户头像")
private String userImage;
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
index da36346..e381c62 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java
@@ -445,7 +445,6 @@
}
}
-
/**
* 课后视频课表
*/
@@ -499,7 +498,6 @@
}
}
-
@ResponseBody
@PostMapping("/api/startCource/payCourseInfo")
@ApiOperation(value = "课后练习-购课详情（用于购课）", tags = {"APP-开始上课"})
@@ -513,7 +511,6 @@
return ResultUtil.runErr();
}
}
-
@ResponseBody
@PostMapping("/api/startCource/getMyCourseList")
@@ -552,7 +549,6 @@
}
}
-
/**
* 更新课后视频学习状态
*/
@@ -573,7 +569,6 @@
return ResultUtil.runErr();
}
}
-
@ResponseBody
@@ -617,7 +612,6 @@
}catch (Exception e){
return ResultUtil.runErr();
}
-
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/request/PayCourseReq.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/request/PayCourseReq.java
index ea9e5f8..9aee1a8 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/vo/request/PayCourseReq.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/request/PayCourseReq.java
@@ -10,7 +10,7 @@
@ApiModelProperty(value = "需要购买的课程id")
private Integer courseId;
@ApiModelProperty(value = "用于购买课包id")
- private Integer oldCourseId;
+ private Long oldCourseId;
@ApiModelProperty(value = "用于购买课程时间 如 2020-03-01")
private List<String> time;
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 f332ffb..0f3ac1f 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
@@ -818,7 +818,7 @@
// 今天周几
int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
- SimpleDateFormat format = new SimpleDateFormat("MM.dd");
+ SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd");
ArrayList<String> strings1 = new ArrayList<>();
for (Integer integer : week) {
@@ -917,7 +917,7 @@
return ResultUtil.error("当前课包课时数不足");
}
tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours()-req.getNum());
- this.baseMapper.updateById(tCoursePackagePayment);
+ this.baseMapper.updateHoursById(tCoursePackagePayment.getId(),-req.getNum());
TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId());
@@ -974,7 +974,7 @@
student1.setReservationStatus(1);
student1.setInsertTime(new Date());
cpsMapper.insert(student1);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -985,7 +985,7 @@
// 2.0
TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
tCourseInfoRecord.setUserId(userId);
- tCourseInfoRecord.setCourseId(req.getOldCourseId());
+ tCourseInfoRecord.setCourseId(req.getCourseId());
tCourseInfoRecord.setName("体验购课");
tCourseInfoRecord.setNum(req.getNum());
tCourseInfoRecord.setTime(new Date());
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
index 18512d7..47cb089 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageServiceImpl.java
@@ -1220,7 +1220,7 @@
Date date = sdf1.parse(sdf.format(new Date()) + " 00:00:00");
List<String> list = Arrays.asList(coursePackage.getClassWeeks().split(";"));
String value = coursePackage.getClassStartTime();
- String value1 = coursePackage.getClassEndTime();
+ String value1 = coursePackage.getClassEndTime().trim();
String[] star = value.split(",");
String[] end = value1.split(",");
diff --git a/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java b/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
index 5ae4606..7ca8683 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/entity/Banner.java
@@ -35,7 +35,7 @@
* 跳转页面
*/
@TableField("jumpPage")
- private String jumpPage;
+ private Integer jumpPage;
/**
* 排序
*/
@@ -74,8 +74,8 @@
/**
* 跳转页面id
*/
- @TableField("pageId")
- private Integer pageId;
+ @TableField("page")
+ private String page;
/**
* 跳转类型id
*/
diff --git a/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java b/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
index eff35c2..389d485 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/model/QuerySiteInfoVo.java
@@ -51,6 +51,6 @@
private Double cashPriceOne;
@ApiModelProperty("玩湃币价格（x/半小时）半场")
- private Double playPaiCoinOne;
+ private Integer playPaiCoinOne;
}
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index e2eb379..5bcce9e 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -113,7 +113,10 @@
querySiteInfoVo.setImgs(site.getImgs());
querySiteInfoVo.setDistance(0D);
querySiteInfoVo.setCashPriceOne(site.getCashPriceOne());
- querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne());
+ if(site.getPlayPaiCoinOne()!=null){
+ querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne().intValue());
+ }
+
querySiteInfoVo.setIntroduce(site.getIntroduce());
ArrayList<String> nextName = new ArrayList<>();
ArrayList<String> halfName = new ArrayList<>();
@@ -158,19 +161,29 @@
e.setTime(sdf.parse(day + " " + site.getAppointmentEndTime()));
int hour = e.get(Calendar.HOUR_OF_DAY);
+
int minute = e.get(Calendar.MINUTE);
+
List<QuerySiteTimes> list = new ArrayList<>();
+
SimpleDateFormat sdfs = new SimpleDateFormat("HH:mm");
+
while (true){
+
String start = sdfs.format(s.getTime());
s.set(Calendar.MINUTE, s.get(Calendar.MINUTE) + 30);
+
int e_hour = s.get(Calendar.HOUR_OF_DAY);
+
int e_minute = s.get(Calendar.MINUTE);
+
String end = sdfs.format(s.getTime());
QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+
querySiteTimes.setTime(start + "-" + end);
+
querySiteTimes.setSelectable(1);
SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("state", 1)
--
Gitblit v1.7.1