From a99684a9a4ecbdd71d1c93ef824f7741ff52c5d9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 16 九月 2023 11:06:13 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 186 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 176 insertions(+), 10 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 8d2bccb..4e7fbbd 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
@@ -14,6 +14,7 @@
import com.dsh.course.feignclient.account.model.AppUser;
import com.dsh.course.feignclient.account.model.Coach;
import com.dsh.course.feignclient.account.model.Student;
+import com.dsh.course.feignclient.account.model.TCourseInfoRecord;
import com.dsh.course.feignclient.activity.BenefitVideoClient;
import com.dsh.course.feignclient.activity.CouponClient;
import com.dsh.course.feignclient.activity.model.BenefitsVideos;
@@ -27,20 +28,20 @@
import com.dsh.course.model.QueryWalkInStudentList;
import com.dsh.course.model.dto.DiscountJsonDto;
import com.dsh.course.model.vo.RegisterCourseVo;
-import com.dsh.course.model.vo.request.ClasspaymentRequest;
-import com.dsh.course.model.vo.request.CourseOfAfterRequest;
-import com.dsh.course.model.vo.request.CourseWithDetailsRequest;
-import com.dsh.course.model.vo.request.UpdateCourseVideoStatusRequest;
-import com.dsh.course.model.vo.response.AppUserVideoResponse;
-import com.dsh.course.model.vo.response.CourseDetailsResponse;
-import com.dsh.course.model.vo.response.CourseOfVideoResponse;
+import com.dsh.course.model.vo.request.*;
+import com.dsh.course.model.vo.response.*;
import com.dsh.course.service.ICoursePackageSchedulingService;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
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.web.client.RestTemplate;
import javax.annotation.Resource;
import java.math.BigDecimal;
@@ -107,6 +108,10 @@
@Autowired
private ICoursePackageSchedulingService coursePackageSchedulingService;
+
+
+ @Autowired
+ private RestTemplate internalRestTemplate;
@@ -221,13 +226,18 @@
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
Store store = stoClient.queryStoreById(coursePackage.getStoreId());
RegisterCourseVo registerCourseVo = new RegisterCourseVo();
+ // 2.0
+ registerCourseVo.setType(coursePackage.getType());
+
registerCourseVo.setCoursePayId(tCoursePackagePayment.getId());
registerCourseVo.setCoursePackageId(tCoursePackagePayment.getCoursePackageId());
registerCourseVo.setCoursePackTypeId(coursePackage.getCoursePackageTypeId());
registerCourseVo.setPackageImg(coursePackage.getCoverDrawing());
String storeAndCourse = coursePackage.getName()+"("+ store.getName() +")";
registerCourseVo.setCourseNameStore(storeAndCourse);
- registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
+// registerCourseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
+ // 2.0
+ registerCourseVo.setCourseTime(new SimpleDateFormat("yyyy-MM-dd").format(tCoursePackagePayment.getInsertTime()));
Coach coach = coachClient.queryCoachById(coursePackage.getCoachId());
registerCourseVo.setCourseTeacher(ToolUtil.isEmpty(coach) ? "" : coach.getName());
List<CoursePackageStudent> coursePackageStudents = cpsMapper.selectList(new QueryWrapper<CoursePackageStudent>()
@@ -602,7 +612,6 @@
String[] split = classWeeks.split(";");
List<String> integerList = Arrays.asList(split);
String weekOfDate = DateTimeHelper.getWeekOfDate(new Date());
-
if (integerList.contains(weekOfDate)){
String dat = simpleDateFormat.format(date) +" "+ classStartTime;
@@ -614,11 +623,18 @@
}
if (start.after(new Date())){
recordVo.setStatus(1);
+ }else if(coursePackageStudent.getSignInOrNot()==2){
+ recordVo.setStatus(5);
}else {
CancelledClasses cancelledClasses = cacMapper.selectOne(new QueryWrapper<CancelledClasses>()
.eq("coursePackageId",tCoursePackagePayment.getCoursePackageId() ));
if (ToolUtil.isNotEmpty(cancelledClasses)){
recordVo.setStatus(3);
+ // 消课 到课状态0 旷课
+ if(coursePackageStudent.getSignInOrNot()==0){
+ recordVo.setStatus(6);
+ }
+
}else {
recordVo.setStatus(2);
}
@@ -626,10 +642,10 @@
}else {
recordVo.setStatus(1);
}
+
}else {
recordVo.setStatus(4);
}
-
recordVoList.add(recordVo);
}
}
@@ -745,4 +761,154 @@
}
return list;
}
+
+ @Override
+ public List<PayCourseRes> getMyCourseList(Integer storeId, Integer appUserId) {
+ // 找到购买的课包
+ List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new LambdaQueryWrapper<TCoursePackagePayment>().eq(TCoursePackagePayment::getAppUserId, appUserId));
+ ArrayList<PayCourseRes> payCourseRes = new ArrayList<>();
+ for (TCoursePackagePayment tCoursePackagePayment : tCoursePackagePayments) {
+ TCoursePackage tCoursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
+ if(tCoursePackage.getStoreId().equals(storeId)){
+ PayCourseRes payCourseRes1 = new PayCourseRes();
+ payCourseRes1.setId(tCoursePackagePayment.getId());
+ payCourseRes1.setName(tCoursePackage.getName());
+ payCourseRes1.setCourseNum(tCoursePackagePayment.getLaveClassHours());
+ payCourseRes.add(payCourseRes1);
+
+ }
+ }
+ return payCourseRes;
+ }
+
+ @Override
+ public PayCourseInfoReq payCourseInfo(Integer courseId){
+ PayCourseInfoReq payCourseInfoReq = new PayCourseInfoReq();
+ TCoursePackage tCoursePackage = tcpmapper.selectById(courseId);
+ payCourseInfoReq.setId(courseId);
+ payCourseInfoReq.setName(tCoursePackage.getName());
+ payCourseInfoReq.setNum(tCoursePackage.getNeedNum());
+ payCourseInfoReq.setWeek(tCoursePackage.getClassWeeks());
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+ String[] split = classStartTime.split(",");
+ String[] split1 = classEndTime.split(",");
+ ArrayList<String> strings = new ArrayList<>();
+ for (int i = 0; i < classStartTime.split(",").length; i++) {
+ String s = split[i] + "-" + split1[i];
+ strings.add(s);
+ }
+ payCourseInfoReq.setTime(strings);
+ return payCourseInfoReq;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRES_NEW)
+ public ResultUtil payCourse(PayCourseReq req,Integer userId){
+ // 扣除 原来的课时数
+ // 添加购买课时 paytyoe为7
+ // 排课可期 判断课程时间段 添加排课表 添加上课记录表
+ // 找到原来的课包 扣课时
+ TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(req.getOldCourseId());
+ if(req.getNum()>tCoursePackagePayment.getLaveClassHours()){
+ return ResultUtil.error("当前课包课时数不足");
+ }
+ tCoursePackagePayment.setLaveClassHours(tCoursePackagePayment.getLaveClassHours()-req.getNum());
+ this.baseMapper.updateById(tCoursePackagePayment);
+
+
+ TCoursePackage tCoursePackage = tcpmapper.selectById(req.getCourseId());
+ // 添加课包
+ TCoursePackagePayment tCoursePackagePayment1 = new TCoursePackagePayment();
+ tCoursePackagePayment1.setAppUserId(userId);
+ Student student = studentClient.queryDefaultStudent(userId);
+ // student ID
+ Integer sId=null;
+ if(student!=null){
+ tCoursePackagePayment1.setStudentId(student.getId());
+ sId=student.getId();
+ }
+ tCoursePackagePayment1.setCoursePackageId(tCoursePackage.getId());
+ tCoursePackagePayment1.setPayType(7);
+ tCoursePackagePayment1.setClassHours(req.getNum());
+ tCoursePackagePayment1.setOriginalPrice(0.0);
+ tCoursePackagePayment1.setTotalClassHours(req.getNum());
+ tCoursePackagePayment1.setLaveClassHours(req.getNum());
+ tCoursePackagePayment1.setAbsencesNumber(0);
+ tCoursePackagePayment1.setPayUserType(1);
+ tCoursePackagePayment1.setPayStatus(2);
+ tCoursePackagePayment1.setPayUserId(userId);
+ tCoursePackagePayment1.setStatus(1);
+ tCoursePackagePayment1.setState(1);
+ tCoursePackagePayment1.setInsertTime(new Date());
+ this.baseMapper.insert(tCoursePackagePayment1);
+ // 找出课包时间段
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String classStartTime = tCoursePackage.getClassStartTime();
+ String classEndTime = tCoursePackage.getClassEndTime();
+ String[] split = classStartTime.split(",");
+ String[] split1 = classEndTime.split(",");
+ List<String> time = req.getTime();
+ for (String s : time) {
+ for (int i = 0; i < split.length; i++) {
+ CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
+ coursePackageScheduling.setCourseId(tCoursePackage.getId());
+ try {
+ Date parse = format.parse(s + " " + split[i]);
+ Date parse1 = format.parse(s + " " + split1[i]);
+ coursePackageScheduling.setClassDate(parse);
+ coursePackageScheduling.setEndDate(parse1);
+ coursePackageScheduling.setStatus(1);
+ coursePackageSchedulingService.save(coursePackageScheduling);
+
+ CoursePackageStudent student1 = new CoursePackageStudent();
+ student1.setAppUserId(userId);
+ student1.setStudentId(sId);
+ student1.setCoursePackageId(tCoursePackage.getId());
+ student1.setCoursePackagePaymentId(tCoursePackagePayment1.getId());
+ student1.setCoursePackageSchedulingId(coursePackageScheduling.getId());
+ student1.setSignInOrNot(0);
+ student1.setReservationStatus(1);
+ student1.setInsertTime(new Date());
+ cpsMapper.insert(student1);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+
+ // 2.0
+ TCourseInfoRecord tCourseInfoRecord = new TCourseInfoRecord();
+ tCourseInfoRecord.setUserId(userId);
+ tCourseInfoRecord.setCourseId(req.getOldCourseId());
+ tCourseInfoRecord.setName("体验购课");
+ tCourseInfoRecord.setNum(req.getNum());
+ tCourseInfoRecord.setTime(new Date());
+ tCourseInfoRecord.setType(2);
+ appuClient.addCourseInfoRecord(tCourseInfoRecord);
+
+
+ if(tCoursePackagePayment.getLaveClassHours()<=3){
+ Integer appUserId = userId;
+
+ //调用推送
+ HttpHeaders headers = new HttpHeaders();
+ // 以表单的方式提交
+ headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+ String s1 = appUserId + "_" + "Three";
+ //定时修改排课状态
+ String s = internalRestTemplate.getForObject("http://mb-cloud-gateway/netty/sendMsgToClient?id="+s1, String.class);
+ JSONObject jsonObject1 = JSON.parseObject(s, JSONObject.class);
+ if(jsonObject1.getIntValue("code") != 200){
+ System.err.println(jsonObject1.getString("msg"));
+ }
+ }
+
+ return ResultUtil.success();
+
+ }
+
+
}
--
Gitblit v1.7.1