From 4146ce356365a67fec0509d64ebcf52f74c7ade9 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 27 九月 2023 11:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 44 +++++++++++++++++++++++++++++++++++---------
1 files changed, 35 insertions(+), 9 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..49b711f 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
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsh.course.entity.*;
+import com.dsh.course.entity.TAppUser;
import com.dsh.course.feignclient.account.AppUserClient;
import com.dsh.course.feignclient.account.CoachClient;
import com.dsh.course.feignclient.account.StudentClient;
@@ -33,12 +34,14 @@
import com.dsh.course.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -129,6 +132,22 @@
list.add(value);
}
return cpConfigMapper.changeState(list,dto.getPayUserName(),dto.getUserId());
+ }
+
+ @Override
+ public void updateBytime(TCoursePackagePayment coursePackagePayment) {
+ this.baseMapper.updateBytime(coursePackagePayment);
+ }
+
+ @Override
+ public List<RegisterOrderVO> listAllRegister(RegisterOrderQuery query) {
+ String STime = null;
+ String ETime = null;
+ if (StringUtils.hasLength(query.getRegisterTime())) {
+ STime = query.getRegisterTime().split(" - ")[0] + " 00:00:00";
+ ETime = query.getRegisterTime().split(" - ")[1] + " 23:59:59";
+ }
+ return cpConfigMapper.listAllRegister(query,STime,ETime,query.getAmount());
}
/**
@@ -724,17 +743,23 @@
}
List<Map<String, Object>> list = this.baseMapper.queryRegistrationRecord(page, coursePackageId, userIds, studentIds);
for (Map<String, Object> map : list) {
+
Long id = Long.valueOf(map.get("id").toString());
Integer appUserId = Integer.valueOf(map.get("appUserId").toString());
Integer studentId = Integer.valueOf(map.get("studentId").toString());
- AppUser appUser = appuClient.queryAppUser(appUserId);
+
+ TAppUser appUser = appuClient.queryAppUser1(appUserId);
map.put("userName", null != appUser ? appUser.getName() : "");
map.put("phone", null != appUser ? appUser.getPhone() : "");
Student student = studentClient.queryStudentById(studentId);
map.put("studentName", null != student ? student.getName() : "");
Integer integer = cpsMapper.selectCount(new QueryWrapper<CoursePackageStudent>().eq("appUserId", appUserId)
- .eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 1));
+ .eq("studentId", studentId).eq("coursePackagePaymentId", id).eq("signInOrNot", 2));
map.put("already", integer);
+// if (student != null && student.getName().equals("杨锴1")) {
+// map.put("totalClassHours", "测试");
+// }
+ ;
}
return list;
}
@@ -831,7 +856,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 +955,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());
@@ -983,11 +1008,12 @@
student1.setCoursePackageId(tCoursePackage.getId());
student1.setCoursePackagePaymentId(tCoursePackagePayment1.getId());
student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
- student1.setSignInOrNot(0);
+ student1.setSignInOrNot(1);
student1.setReservationStatus(1);
student1.setInsertTime(new Date());
+ student1.setType(1);
cpsMapper.insert(student1);
- } catch (ParseException e) {
+ } catch (Exception e) {
e.printStackTrace();
}
@@ -998,7 +1024,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());
@@ -1032,8 +1058,8 @@
}
@Override
- public List<Integer> getStudentIds(Integer payId) {
- return this.baseMapper.getStudentIds(payId);
+ public List<Integer> getStudentIds(Long payId, Integer classId, Integer appId) {
+ return this.baseMapper.getStudentIds(payId,classId,appId);
}
@Override
--
Gitblit v1.7.1