From a1e80d905fd38f6ead484396b788fe19b0a3d7d5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 08 十二月 2023 09:16:13 +0800
Subject: [PATCH] 修改bug
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 88 +++++++++++++++++--------------------------
1 files changed, 35 insertions(+), 53 deletions(-)
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 9bc7408..9c618e6 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
@@ -28,6 +28,7 @@
import com.dsh.course.util.*;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.obs.services.internal.ServiceException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -179,6 +180,7 @@
coursePackageOrder.setStudentIds(String.valueOf(packagePayment.getStudentId()));
coursePackageOrder.setCoursePackageId(packagePayment.getCoursePackageId());
coursePackageOrder.setClassHours(packagePayment.getClassHours());
+ coursePackageOrder.setLaveClassHours(packagePayment.getClassHours());
coursePackageOrder.setOriginalPrice(packagePayment.getOriginalPrice());
coursePackageOrder.setCashPayment(packagePayment.getCashPayment());
coursePackageOrder.setPlayPaiCoin(packagePayment.getPlayPaiCoin());
@@ -245,7 +247,7 @@
coursePackageOrderStudentService.saveOrUpdate(coursePackageOrderStudent);
Integer studentId = Integer.valueOf(byId1.getStudentIds());
//开始排课
- addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+ addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
} else {
Date useTime = coursePackageOrderStudent.getUseTime();
coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + byId1.getClassHours());
@@ -278,12 +280,12 @@
Integer studentId = Integer.valueOf(byId1.getStudentIds());
//中间断课，没有连续续费的情况需要重新排课
if (useTime.compareTo(new Date()) < 0) {
- addPackageStudent1(byId, byId1.getAppUserId(), studentId, coursePackageOrderStudent);
+ addPackageStudent1(byId, byId1.getAppUserId(), studentId, byId1, coursePackageOrderStudent);
}
}
}
if(byId.getType() == 2){
- addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), null);
+ addPackageStudent1(byId, byId1.getAppUserId(), Integer.valueOf(byId1.getStudentIds()), byId1, null);
}
return packagePaymentService.changeState(dto);
}
@@ -333,7 +335,7 @@
Store store = storeClient.queryStoreById(re.getStoreId());
TAppUser appUser = appUserClient.queryAppUser1(re.getAppUserId());
String studentId = re.getStudentId();
- String[] split = studentId.split(",");
+ String[] split = studentId.split(";");
StringBuilder stringBuilder = new StringBuilder("");
for (String s : split) {
@@ -919,7 +921,6 @@
Set<BaseVo> set = new HashSet<>(list);
List<BaseVo> back = new ArrayList<>(set);
-
return ResultUtil.success(back);
} catch (Exception e) {
e.printStackTrace();
@@ -937,25 +938,11 @@
@ApiImplicitParam(name = "Authorization", value = "Bearer +token", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
})
public ResultUtil<List<AppUserVideoResponse>> queryAfterSourceList(CourseOfAfterRequest search) throws Exception {
-// try {
Integer appUserId = tokenUtil.getUserIdFormRedis();
if (null == appUserId) {
return ResultUtil.tokenErr();
}
-//
-// List<Integer> courseIds = new ArrayList<>();
-// QueryWrapper<TCoursePackagePayment> queryWrapper = new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId)
-// .groupBy("coursePackageId");
-// if (ToolUtil.isNotEmpty(search.getCourseTypeId())){
-// queryWrapper.eq("coursePackageId",search.getCourseTypeId());
-// }
-// List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.list(queryWrapper);
-// if (tCoursePackagePayments.size() > 0 ){
-// courseIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
-// }
-
-
QueryWrapper<CoursePackageStudent> queryWrapper1 = new QueryWrapper<CoursePackageStudent>().eq("studentId", search.getStuId());
if (ToolUtil.isNotEmpty(search.getCourseTypeId())) {
queryWrapper1.eq("coursePackageId", search.getCourseTypeId());
@@ -968,7 +955,6 @@
}
System.out.println("======longs========" + longs);
-// List<CoursePackageScheduling> coursePackageSchedulings = coursePackageSchedulingService.list(new QueryWrapper<CoursePackageScheduling>().in("id",longs).isNotNull("courseId"));
List<AppUserVideoResponse> coursePackageSchedulings1 = coursePackageSchedulingService.queryAll(longs);
if (search.getSearch() != null) {
@@ -983,11 +969,6 @@
}
return ResultUtil.success(coursePackageSchedulings1);
-
-
-// }catch (Exception e){
-// return ResultUtil.runErr();
-// }
}
/**
@@ -1202,7 +1183,6 @@
*/
@PostMapping("/base/coursePackage/alipayRegisteredCoursesCallback")
public void alipayCallback(HttpServletRequest request, HttpServletResponse response) {
- System.err.println("========支付宝支付回调========");
try {
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if (null != map) {
@@ -1749,7 +1729,7 @@
if (student != null) {
sId = student.getId();
}
- addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment.getId());
+ addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePayment, coursePackagePayment.getId());
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1772,7 +1752,7 @@
if (student != null) {
sId = student.getId();
}
- addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne.getId());
+ addPackageStudent(orderDto.getClassId(), orderDto.getAppUserId(), Integer.valueOf(s), coursePackagePaymentServiceOne, coursePackagePaymentServiceOne.getId());
CourseCounsum courseCounsum = new CourseCounsum();
@@ -1922,7 +1902,8 @@
@Autowired
private TCoursePackageService coursePackageService;
- private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrderStudent coursePackageOrderStudent) {
+
+ private void addPackageStudent1(TCoursePackage tCoursePackage, Integer userId, Integer sId, CoursePackageOrder coursePackageOrder, CoursePackageOrderStudent coursePackageOrderStudent) {
try {
//1常规 2假期 3体验
if (tCoursePackage.getType() == 1) {
@@ -1979,6 +1960,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -2039,6 +2021,7 @@
coursePackageScheduling.setAppUserId(userId);
coursePackageScheduling.setStudentId(sId);
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackageOrder.getId().toString());
Date parse = format1.parse(format.format(time) + " " + split[j]);
Date parse1 = format1.parse(format.format(time) + " " + split1[j]);
coursePackageScheduling.setClassDate(parse);
@@ -2064,7 +2047,7 @@
e.printStackTrace();
}
}
- private void addPackageStudent(Integer courseId, Integer userId, Integer sId, Long paymentId) throws ParseException {
+ private void addPackageStudent(Integer courseId, Integer userId, Integer sId, TCoursePackagePayment coursePackagePayment, Long paymentId) throws ParseException {
// 课包
TCoursePackage tCoursePackage = coursePackageService.getById(courseId);
@@ -2115,6 +2098,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
@@ -2178,6 +2162,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(coursePackagePayment.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
@@ -2290,6 +2275,7 @@
}
CoursePackageScheduling coursePackageScheduling = new CoursePackageScheduling();
coursePackageScheduling.setCoursePackageId(tCoursePackage.getId());
+ coursePackageScheduling.setCoursePackagePaymentIds(pay.getId().toString());
Date parse = format1.parse(format.format(date) + " " + split[i1]);
Date parse1 = format1.parse(format.format(date) + " " + split1[i1]);
coursePackageScheduling.setClassDate(parse);
@@ -2388,13 +2374,13 @@
@ResponseBody
@PostMapping("/coursePackagePayment/consumeCourse")
- public ResultUtil consumeCourse(@RequestBody Integer coursePackagePaymentId) {
+ public Integer consumeCourse(@RequestBody Integer coursePackagePaymentId) {
CoursePackageOrderStudent coursePackageOrderStudent = orderStudentService.getById(coursePackagePaymentId);
TCoursePackage coursePackage = coursePackageService.getById(coursePackageOrderStudent.getCoursePackageId());
if (coursePackageOrderStudent.getLaveClassHours()<coursePackage.getNeedNum()){
- return ResultUtil.error("当前学员课时数不足");
+ return 1;
}
coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours()-coursePackage.getNeedNum());
orderStudentService.updateById(coursePackageOrderStudent);
@@ -2405,14 +2391,14 @@
courseCounsum.setInsertTime(new Date());
courseCounsum.setReason("补课");
courseCounsumService.save(courseCounsum);
- return ResultUtil.success("补课成功");
+ return 2;
}
@ResponseBody
@PostMapping("/coursePackagePayment/CountqueryByClassId")
public Integer CountqueryByClassId(@RequestBody Integer id) {
- int coursePackageId = packagePaymentService.count(new QueryWrapper<TCoursePackagePayment>().eq("coursePackageId", id));
+ int coursePackageId = coursePackageOrderStudentService.count(new QueryWrapper<CoursePackageOrderStudent>().eq("coursePackageId", id));
return coursePackageId;
@@ -2553,10 +2539,10 @@
map.put("name", store.getName());
map.put("lon", lon);
map.put("lat", lat);
-
-
// 找出门店的所有课程 排出体验
- List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>().eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3).eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
+ List<TCoursePackage> list = tcpService.list(new LambdaQueryWrapper<TCoursePackage>()
+ .eq(TCoursePackage::getStoreId, courseDetailReq.getStoreId()).ne(TCoursePackage::getType, 3)
+ .eq(TCoursePackage::getState, 1).like(TCoursePackage::getClassWeeks, week));
List<Integer> collect = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
@@ -2568,21 +2554,6 @@
.in(CoursePackageScheduling::getCoursePackageId, collect)
);
List<Integer> collect1 = list8.stream().map(CoursePackageScheduling::getCoursePackageId).collect(Collectors.toList());
- // 找出购买的课包
- List<CoursePackageOrderStudent> list1 = coursePackageOrderStudentService.list(new QueryWrapper<CoursePackageOrderStudent>()
- .eq("appUserId", courseDetailReq.getAppUserId())
- .eq("studentId", courseDetailReq.getStuId())
- .in("coursePackageId", collect1)
- .eq("status", 1)
- .eq("state", 1)
- );
-
-
-
-// List<Integer> collect1 = list1.stream().map(CoursePackageOrderStudent::getCoursePackageId).collect(Collectors.toList());
-// List<Long> ids = list1.stream().map(CoursePackageOrderStudent::getId).collect(Collectors.toList());
-
-
for (TCoursePackage tCoursePackage : list) {
DetailsListVo detailsListVo = new DetailsListVo();
detailsListVo.setId(tCoursePackage.getId());
@@ -2661,14 +2632,25 @@
detailsListVo.setIsType(list4.get(0).getType());
for (CoursePackageStudent coursePackageStudent : list4) {
+ CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(coursePackageStudent.getCoursePackageSchedulingId());
+ if (coursePackageScheduling.getStatus()==4){
+ detailsListVo.setIsType(3);
+ }
+
Integer signInOrNot1 = coursePackageStudent.getSignInOrNot();
detailsListVo.setType(1);
if (signInOrNot1 == 2) {
detailsListVo.setType(3);
}
+ //体验购课去掉按钮
+ if(coursePackageScheduling.getType() == 3){
+ detailsListVo.setCourseType(3);
+ detailsListVo.setType(2);
+ }
+
+
detailsListVo.setIsType(coursePackageStudent.getType());
- CoursePackageScheduling coursePackageScheduling = coursePackageSchedulingMapper.selectById(coursePackageStudent.getCoursePackageSchedulingId());
Date classDate = coursePackageScheduling.getClassDate();
Date endDate = coursePackageScheduling.getEndDate();
SimpleDateFormat sdf = new SimpleDateFormat("HH:mm");
--
Gitblit v1.7.1