From dfe52245f20a8177a0db0bc2841909fb3eab0f13 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 08 十一月 2023 09:07:05 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 12e9cf9..96e9b12 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
@@ -163,15 +163,6 @@
List<Map<String, Object>> studentTotal = this.baseMapper.getStudentTotal(studentQeryDto);
for (Map<String, Object> student : studentTotal) {
- BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
- BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
- BigDecimal hasHours = (BigDecimal) student.get("hasHours");
-
- BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
- .multiply(hasHours).setScale(2, RoundingMode.HALF_UP);
- student.put("hasPayment", hasPayment);
-
-
Integer appUserId = (Integer) student.get("appUserId");
AppUser appUser = appuClient.queryAppUser(appUserId);
student.put("province", appUser.getProvince());
@@ -182,8 +173,18 @@
Student studentId = studentClient.queryStudentById((Integer) student.get("studentId"));
student.put("studentName", studentId.getName());
-
-
+ BigDecimal cashPayment = (BigDecimal) student.get("cashPayment");
+ BigDecimal totalClassHours = (BigDecimal) student.get("totalClassHours");
+ BigDecimal hasHours = (BigDecimal) student.get("hasHours");
+ if (cashPayment==null){
+ continue;
+ }
+ if (totalClassHours.compareTo(BigDecimal.ZERO)==0){
+ totalClassHours = totalClassHours.add(new BigDecimal("1"));
+ }
+ BigDecimal hasPayment = cashPayment.divide(totalClassHours, 2, RoundingMode.HALF_UP)
+ .multiply(hasHours).setScale(2, RoundingMode.HALF_UP);
+ student.put("hasPayment", hasPayment);
}
if (studentQeryDto.getCityCode()!=null&&studentQeryDto.getCityCode()!="") {
@@ -388,6 +389,9 @@
registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime()));
Coach coach = coachClient.queryCoachById(coursePackage.getCoachId());
registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName());
+ if (coursePackage.getType()==2) {
+ registerCourseVo.setTime(new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getStartTime()) + "-" + new SimpleDateFormat("yyyy-MM-dd").format(coursePackage.getEndTime()));
+ }
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
.eq("coursePackageId",coursePackage.getId())
.eq("studentId",appUserId ));
@@ -431,6 +435,7 @@
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
response.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
response.setCoverDrawing(coursePackage.getCoverDrawing());
+ response.setDetailDrawing(coursePackage.getDetailDrawing());
response.setCoursePackageName(coursePackage.getName());
response.setCoursePayId(tCoursePackagePayment.getId());
List<Integer> integers = StrUtils.dealStrToList(coursePackage.getClassWeeks());
@@ -661,7 +666,7 @@
public ResultUtil AlipayPayment(String code, BigDecimal request){
TCoursePackagePaymentMapper baseMapper1 = this.baseMapper;
- ResultUtil alipay = payMoneyUtil.alipay("课包购买", "", "", code, request.toString(),
+ ResultUtil alipay = payMoneyUtil.alipay("课包购买", "课包购买", "", code, request.toString(),
"/base/coursePackage/alipayRegisteredCoursesCallback");
if(alipay.getCode() == 200){
new Thread(new Runnable() {
@@ -807,6 +812,9 @@
// String classStartTime = coursePackage.getClassStartTime();
// String classEndTime = coursePackage.getClassEndTime();
+ if (byId == null){
+ continue;
+ }
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String dateString1 = sdf.format(byId.getClassDate());
String dateString2 = sdf.format(byId.getEndDate());
@@ -836,8 +844,10 @@
}else if(coursePackageStudent.getSignInOrNot()==2){
recordVo.setStatus(5);
}else {
+// CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
+// .eq("coursePackageId",coursePackageStudent.getCoursePackageId()));
CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
- .eq("coursePackageId",coursePackageStudent.getCoursePackageId() ));
+ .eq("coursePackageSchedulingId",byId.getId()));
if (ToolUtil.isNotEmpty(cancelledClasses)){
recordVo.setStatus(3);
// 消课 到课状态0 旷课
--
Gitblit v1.7.1