From d41358fce9a436d81b9341d06fc1d8f3ddff92ff Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 25 九月 2023 16:17:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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 4cc970a..0dbc7eb 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
@@ -831,7 +831,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) {
@@ -930,7 +930,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());
@@ -987,7 +987,7 @@
student1.setReservationStatus(1);
student1.setInsertTime(new Date());
cpsMapper.insert(student1);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -998,7 +998,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());
--
Gitblit v1.7.1