From 79d2b56c4be7c020e49361498021f0fd1527ea41 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期一, 20 十一月 2023 11:37:51 +0800
Subject: [PATCH] 11.20
---
cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java | 8 ++--
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 2
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackagePaymentServiceImpl.java | 46 +++++++++++++++++-----
cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseDetailsResponse.java | 11 +++++
4 files changed, 51 insertions(+), 16 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 9b277fb..1bc790a 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
@@ -929,7 +929,7 @@
Collections.sort(payCourseInfoReq.getDay(), Comparator.comparing(String::toString));
- return ResultUtil.success(packagePaymentService.payCourseInfo(courseId));
+ return ResultUtil.success(payCourseInfoReq);
}catch (Exception e){
return ResultUtil.runErr();
}
diff --git a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseDetailsResponse.java b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseDetailsResponse.java
index d76c9cc..39dfbb8 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseDetailsResponse.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/model/vo/response/CourseDetailsResponse.java
@@ -1,8 +1,11 @@
package com.dsh.course.model.vo.response;
+import com.dsh.course.model.CoursePackagePaymentConfigVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.util.List;
@Data
public class CourseDetailsResponse {
@@ -46,4 +49,12 @@
private String time;
@ApiModelProperty("1常规 2假期 3体验")
private Integer type;
+ @ApiModelProperty("学员的ids")
+ private List<Integer> stuIds;
+ @ApiModelProperty("选择的课时数")
+ private Integer chooseHours;
+ @ApiModelProperty("课时套餐")
+ private List<CoursePackagePaymentConfigVo> list;
+
+
}
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 1e1e4fc..26f4622 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
@@ -468,6 +468,14 @@
AppUser appUser = appuClient.queryAppUser(appUserId);
CourseDetailsResponse response = new CourseDetailsResponse();
TCoursePackagePayment tCoursePackagePayment = this.baseMapper.selectById(coursePayId);
+ List<TCoursePackagePayment> tCoursePackagePayments = this.baseMapper.selectList(new QueryWrapper<TCoursePackagePayment>().eq("appUserId", appUserId).eq("coursePackageId", tCoursePackagePayment.getCoursePackageId()));
+ List<Integer> stuIds = new ArrayList<>();
+ for (TCoursePackagePayment coursePackagePayment : tCoursePackagePayments) {
+ stuIds.add(coursePackagePayment.getStudentId());
+ }
+ response.setStuIds(stuIds);
+ response.setChooseHours(tCoursePackagePayment.getClassHours());
+
if (null != tCoursePackagePayment){
TCoursePackage coursePackage = tcpmapper.selectById(tCoursePackagePayment.getCoursePackageId());
@@ -537,16 +545,16 @@
}
}
-// switch (payType) {
-// case 1:
-// case 2:
-// response.setAmount(cashPaymentValue);
-// response.setVipAmount(discountMember);
-// break;
-// case 3:
-// response.setWpGold(playPaiCoin);
-// break;
-// }
+ switch (payType) {
+ case 1:
+ case 2:
+ response.setAmount(cashPaymentValue);
+ response.setVipAmount(discountMember);
+ break;
+ case 3:
+ response.setWpGold(playPaiCoin);
+ break;
+ }
// coursePackage.get
@@ -661,6 +669,22 @@
}
coursePackagePaymentConfigVo.setPaymentPrice(paymentPrice);
+
+ TCoursePackageDiscount discount = coursePackageDiscountService.getOne(new QueryWrapper<TCoursePackageDiscount>().eq("coursePackagePaymentConfigId", coursePackagePaymentConfig.getId())
+ .eq("type", 2).eq("auditStatus", 2));
+
+ Double continuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingUser");
+ Double vipcontinuingMember = JSON.parseObject(discount.getContent()).getDouble("continuingMember");
+
+
+ if (coursePackagePaymentConfigVo.getPaymentPrice()>continuingMember){
+ coursePackagePaymentConfigVo.setPaymentPrice(continuingMember);
+ }
+ if (coursePackagePaymentConfigVo.getVipPrice()>vipcontinuingMember){
+ coursePackagePaymentConfigVo.setVipPrice(vipcontinuingMember);
+ }
+
+
if (coursePackagePaymentConfigVo.getPaymentPrice()<coursePackagePaymentConfigVo.getVipPrice()){
coursePackagePaymentConfigVo.setOriginalPrice(coursePackagePaymentConfig.getCashPayment());
coursePackagePaymentConfigVo.setVipPrice(null);
@@ -682,7 +706,7 @@
}
list.add(coursePackagePaymentConfigVo);
});
-// coursePackageInfo.setList(list);
+ response.setList(list);
diff --git a/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java b/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
index 1af557f..57260e2 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/util/TaskUtil.java
@@ -94,8 +94,8 @@
* 零时任务
*/
// @Scheduled(cron = "0 0 0 * * *")
- public void zeroTask(){
- //定时添加排课数据
- coursePackageSchedulingService.taskAddData();
- }
+// public void zeroTask(){
+// //定时添加排课数据
+// coursePackageSchedulingService.taskAddData();
+// }
}
--
Gitblit v1.7.1