From 9529d226bc6102a6f632fa14bf1e5a667d745e75 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期二, 26 九月 2023 19:49:18 +0800
Subject: [PATCH] 9.26。3
---
cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java | 2 +
cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java | 2
cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java | 2 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java | 3 +
.idea/workspace.xml | 42 +++++++++++++++++---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 14 +++++++
cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml | 6 +++
cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java | 3 +
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 5 ++
9 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b1816f2..ad7653d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -22,12 +22,16 @@
<select />
</component>
<component name="ChangeListManager">
- <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。1">
+ <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。2">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord.js" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/static/modular/system/coursePackage/classRecord2.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -229,8 +233,8 @@
</configuration>
<list>
<item itemvalue="Spring Boot.GatewayApplication" />
- <item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.ManagementApplication" />
+ <item itemvalue="Spring Boot.OtherApplication" />
<item itemvalue="Spring Boot.UserApplication" />
<item itemvalue="Spring Boot.AccountApplication" />
<item itemvalue="Spring Boot.AuthApplication" />
@@ -290,7 +294,7 @@
<workItem from="1695633789585" duration="4703000" />
<workItem from="1695638521906" duration="1415000" />
<workItem from="1695689815334" duration="13353000" />
- <workItem from="1695718856285" duration="6574000" />
+ <workItem from="1695718856285" duration="9973000" />
</task>
<task id="LOCAL-00001" summary="后台代码删除">
<created>1690249807612</created>
@@ -447,7 +451,15 @@
<option name="project" value="LOCAL" />
<updated>1695723019798</updated>
</task>
- <option name="localTasksCounter" value="22" />
+ <task id="LOCAL-00022" summary="9.26。2">
+ <option name="closed" value="true" />
+ <created>1695725709313</created>
+ <option name="number" value="00022" />
+ <option name="presentableId" value="LOCAL-00022" />
+ <option name="project" value="LOCAL" />
+ <updated>1695725709313</updated>
+ </task>
+ <option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -474,7 +486,8 @@
<MESSAGE value="9.25" />
<MESSAGE value="9.26" />
<MESSAGE value="9.26。1" />
- <option name="LAST_COMMIT_MESSAGE" value="9.26。1" />
+ <MESSAGE value="9.26。2" />
+ <option name="LAST_COMMIT_MESSAGE" value="9.26。2" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
@@ -489,6 +502,21 @@
<line>111</line>
<option name="timeStamp" value="2" />
</line-breakpoint>
+ <line-breakpoint type="java-line">
+ <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java</url>
+ <line>476</line>
+ <option name="timeStamp" value="6" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java</url>
+ <line>449</line>
+ <option name="timeStamp" value="9" />
+ </line-breakpoint>
+ <line-breakpoint enabled="true" type="java-line">
+ <url>file://$PROJECT_DIR$/cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java</url>
+ <line>1305</line>
+ <option name="timeStamp" value="14" />
+ </line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
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 bc00abc..60e4adc 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
@@ -1295,6 +1295,20 @@
}
+
+ /**
+ * 修改数据
+ * @param coursePackagePayment
+ */
+ @ResponseBody
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ public void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment){
+ System.out.println("editCoursePackagePayment1====coursePackagePayment"+coursePackagePayment);
+// coursePackagePayment.setCoursePackageId(null);
+ packagePaymentService.updateBytime(coursePackagePayment);
+ }
+
+
/**
* 上课主页-预约操作
*/
diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
index de5d28d..03f1be1 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java
@@ -65,4 +65,6 @@
List<Integer> getStudentIds(@Param("id")Long payId,@Param("classId")Integer classId,@Param("appId")Integer appId);
boolean updateHoursById(@Param("id") Long id, @Param("i") int i);
+
+ void updateBytime(@Param("coursePackagePayment") TCoursePackagePayment coursePackagePayment);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
index 8e5d9f0..934e62b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/TCoursePackagePaymentService.java
@@ -128,4 +128,6 @@
List<CoursePackagePaymentVO> listAll(CoursePackagePaymentQuery query);
int changeState(CoursePackagePayDTO dto);
+
+ void updateBytime(TCoursePackagePayment coursePackagePayment);
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
index ad47688..9c3a41b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/CoursePackageStudentServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.entity.CoursePackageStudent;
import com.dsh.course.entity.StudentClassInfo;
+import com.dsh.course.entity.TAppUser;
import com.dsh.course.entity.dto.ClassListDto;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.StudentClient;
@@ -71,7 +72,7 @@
for (Map<String, Object> map : list) {
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer student_Id = Integer.valueOf(map.get("studentId").toString());
- AppUser appUser = appUserClient.queryAppUser(appUserId);
+ TAppUser appUser = appUserClient.queryAppUser1(appUserId);
Student student = studentClient.queryStudentById(student_Id);
map.put("userName", appUser.getName());
map.put("phone", student.getPhone());
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 964604b..3061a4d 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
@@ -133,6 +133,11 @@
return cpConfigMapper.changeState(list,dto.getPayUserName(),dto.getUserId());
}
+ @Override
+ public void updateBytime(TCoursePackagePayment coursePackagePayment) {
+ this.baseMapper.updateBytime(coursePackagePayment);
+ }
+
/**
* 获取课包购买人数
* @param coursePackageId
diff --git a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
index 0da6c9e..78a72a0 100644
--- a/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
+++ b/cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml
@@ -136,4 +136,10 @@
</select>
+
+ <update id="updateBytime">
+ update t_course_package_payment
+ set laveClassHours = #{coursePackagePayment.laveClassHours},absencesNumber=#{coursePackagePayment.absencesNumber}
+ where id = #{coursePackagePayment.id}
+ </update>
</mapper>
diff --git a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
index d178b29..d58f682 100644
--- a/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
+++ b/cloud-server-management/src/main/java/com/dsh/course/feignClient/course/CoursePackagePaymentClient.java
@@ -80,6 +80,9 @@
@PostMapping("/coursePackagePayment/editCoursePackagePayment")
void editCoursePackagePayment(TCoursePackagePayment coursePackagePayment);
+ @PostMapping("/coursePackagePayment/editCoursePackagePayment1")
+ void editCoursePackagePayment1(@RequestBody TCoursePackagePayment coursePackagePayment);
+
@PostMapping("/coursePackagePayment/CountqueryByClassId")
Integer queryByClassId(Integer id);
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
index f1247fe..2b7d62a 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/service/impl/CoursePackageService.java
@@ -474,7 +474,7 @@
tCoursePackagePayment.setAbsencesNumber(tCoursePackagePayment.getAbsencesNumber() + 1);
}
System.out.println("====tCoursePackagePayment====="+tCoursePackagePayment);
- coursePackagePaymentClient.editCoursePackagePayment(tCoursePackagePayment);
+ coursePackagePaymentClient.editCoursePackagePayment1(tCoursePackagePayment);
CancelledClasses cancelledClasses = new CancelledClasses();
cancelledClasses.setType(1);
--
Gitblit v1.7.1