From 18b58aaf9bd99cadd0e7f80fe5d80586f2f4831a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 24 十一月 2023 18:32:43 +0800
Subject: [PATCH] 11.24
---
cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
index 7f5a7bf..df12227 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java
@@ -75,14 +75,17 @@
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
-// 判断预约人数是否已满
- Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
- Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
- .eq("appUserId",appUserId )
- .eq("status",1));
- if (integer >= maxSubscribeNumber){
+ if (coursePackage.getState()==2){
continue;
}
+// 判断预约人数是否已满
+// Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
+// Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
+// .eq("appUserId",appUserId )
+// .eq("status",1));
+// if (integer >= maxSubscribeNumber){
+// continue;
+// }
try {
JSONArray jsonArray = JSON.parseArray(tCoursePackageDiscount.getContent());
JSONObject jsonObject = jsonArray.getJSONObject(0);
@@ -209,6 +212,10 @@
if (tCoursePackageDiscounts.size() > 0) {
for (TCoursePackageDiscount tCoursePackageDiscount : tCoursePackageDiscounts) {
TCoursePackage coursePackage = tcpMapper.selectById(tCoursePackageDiscount.getCoursePackageId());
+ if (coursePackage.getState()==2){
+ continue;
+ }
+
// 判断预约人数是否已满
Integer maxSubscribeNumber = coursePackage.getMaxSubscribeNumber();
Integer integer = tcppMapper.selectCount(new QueryWrapper<TCoursePackagePayment>()
@@ -413,11 +420,11 @@
}else {
packageResponse.setDiscountPrice(paymentConfig.getCashPayment());
- packageResponse.setCostPrice(null);
+// packageResponse.setCostPrice(null);
}
Integer cashPayment1 = jsonObject.getInteger("hour");
packageResponse.setFreeClassHours(cashPayment1);
- }else {
+ }else{
packageResponse.setClassHours(paymentConfig.getClassHours());
Integer cashPayment = jsonObject.getInteger("hour");
@@ -514,7 +521,9 @@
ids.add(-1);
queryDiscountList.setIds(ids);
}
- List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage, queryDiscountList.getPCode(), queryDiscountList.getCCode(), queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
+ List<DiscountList> discountLists = this.baseMapper.queryDiscountList(discountListPage,
+ queryDiscountList.getPCode(), queryDiscountList.getCCode(),
+ queryDiscountList.getName(), queryDiscountList.getType(), queryDiscountList.getIds());
for (DiscountList discountList : discountLists) {
List<TCoursePackageDiscount> tCoursePackageDiscounts = this.baseMapper.selectList
(new LambdaQueryWrapper<TCoursePackageDiscount>()
--
Gitblit v1.7.1