From 1eed180f9c2bf73130ddcab66d25e6a641660ff0 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 25 三月 2024 17:13:33 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
index 5e82c62..437749b 100644
--- a/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
+++ b/cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java
@@ -59,8 +59,14 @@
@Autowired
private TCoursePackageDiscountService discountService;
+
@Autowired
private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
+
+ @Autowired
+ private ICoursePackageOrderService coursePackageOrderService;
+
+
/**
* 上/下架 1为上架 2为下架 3为删除
@@ -211,7 +217,7 @@
}
}
- // 2.0
+
@ResponseBody
@PostMapping("/api/course/paymentCourseCouponList")
@ApiOperation(value = "支付课程--完成后优惠券列表", tags = {"APP-课程列表"})
@@ -289,7 +295,6 @@
e.printStackTrace();
}
}
-
/**
* 根据id获取课程数据
@@ -497,14 +502,12 @@
@PostMapping("/course/auditDiscount")
public Boolean auditDiscount(@RequestBody AuditDiscount auditDiscount) {
-
List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>()
.eq(TCoursePackageDiscount::getCoursePackageId, auditDiscount.getId()));
for (TCoursePackageDiscount tCoursePackageDiscount : list) {
tCoursePackageDiscount.setAuditStatus(auditDiscount.getType());
tCoursePackageDiscount.setAuditRemark(auditDiscount.getText());
}
-
return discountService.updateBatchById(list);
}
@@ -522,8 +525,6 @@
selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
integerList.add(selectDto);
}
-
-
return integerList;
}
@@ -534,25 +535,32 @@
List<Integer> ids = queryDataFee.getIds();
if (ids.size() == 0) {
ids.add(-1);
+ }else{
+ List<TCoursePackage> list = coursePackageService.list(new QueryWrapper<TCoursePackage>().in("storeId", ids)
+ .ne("status", 4).eq("auditStatus", 2).eq("state", 1));
+ ids = list.stream().map(TCoursePackage::getId).collect(Collectors.toList());
+ if(ids.size() == 0){
+ ids.add(-1);
+ }
}
- LambdaQueryWrapper<TCoursePackagePayment> wrapper = new LambdaQueryWrapper<>();
+ LambdaQueryWrapper<CoursePackageOrder> wrapper = new LambdaQueryWrapper<>();
if (ToolUtil.isNotEmpty(data)) {
String stime = data.split(" - ")[0] + " 00:00:00";
String etime = data.split(" - ")[1] + " 23:59:59";
- wrapper.between(TCoursePackagePayment::getInsertTime, stime, etime);
+ wrapper.between(CoursePackageOrder::getInsertTime, stime, etime);
}
- wrapper.in(TCoursePackagePayment::getAppUserId, ids);
- wrapper.eq(TCoursePackagePayment::getPayStatus, 2);
+ wrapper.in(CoursePackageOrder::getCoursePackageId, ids);
+ wrapper.eq(CoursePackageOrder::getPayStatus, 2);
ArrayList<Integer> objects = new ArrayList<>();
objects.add(1);
objects.add(2);
objects.add(5);
objects.add(6);
- wrapper.in(TCoursePackagePayment::getPayType, objects);
- List<TCoursePackagePayment> list = coursePackagePaymentService.list(wrapper);
- double v = list.stream().map(TCoursePackagePayment::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
- List<Integer> collect = list.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+ wrapper.in(CoursePackageOrder::getPayType, objects);
+ List<CoursePackageOrder> list = coursePackageOrderService.list(wrapper);
+ double v = list.stream().map(CoursePackageOrder::getCashPayment).reduce(BigDecimal.ZERO, BigDecimal::add).doubleValue();
+ List<Integer> collect = list.stream().map(CoursePackageOrder::getCoursePackageId).collect(Collectors.toList());
if (collect.size() == 0) {
collect.add(-1);
}
@@ -561,7 +569,7 @@
// 课类型
List<TCoursePackageType> list1 = coursePackageTypeService.list();
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
for (TCoursePackage tCoursePackage : list2) {
if (tCoursePackagePayment.getCoursePackageId().equals(tCoursePackage.getId())) {
tCoursePackagePayment.setType(tCoursePackage.getCoursePackageTypeId());
@@ -575,7 +583,7 @@
HashMap<String, Object> objectObjectHashMap = new HashMap<>();
objectObjectHashMap.put("name", tCoursePackageType.getName());
double a = 0;
- for (TCoursePackagePayment tCoursePackagePayment : list) {
+ for (CoursePackageOrder tCoursePackagePayment : list) {
if (tCoursePackagePayment.getType().equals(tCoursePackageType.getId())) {
a += tCoursePackagePayment.getCashPayment().doubleValue();
}
@@ -590,4 +598,53 @@
return map1;
}
+
+
+ /**
+ * 课包支付成功后排课操作
+ * @param addCoursePackageOrderStudent
+ */
+ @PostMapping("/course/addCoursePackageOrderStudent")
+ public void addCoursePackageOrderStudent(@RequestBody AddCoursePackageOrderStudent addCoursePackageOrderStudent){
+ coursePackageService.addCoursePackageOrderStudent(addCoursePackageOrderStudent.getCoursePackageOrderId(), addCoursePackageOrderStudent.getCoursePackagePaymentConfig());
+ }
+
+
+ /**
+ * 根据code获取待支付数据
+ * @param code
+ * @return
+ */
+ @PostMapping("/course/getCoursePackageOrderByCode")
+ public CoursePackageOrder getCoursePackageOrderByCode(@RequestBody String code){
+ CoursePackageOrder coursePackageOrder = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
+ .eq("code", code).eq("state", 1));
+ return coursePackageOrder;
+ }
+
+
+ /**
+ * 修改数据
+ * @param coursePackageOrder
+ */
+ @PostMapping("/course/updateCoursePackageOrder")
+ public void updateCoursePackageOrder(@RequestBody CoursePackageOrder coursePackageOrder){
+ coursePackageOrder.setAppUserId(null);
+ coursePackageOrderService.updateById(coursePackageOrder);
+ }
+
+
+ /**
+ * 获取课包配置
+ * @param getCoursePackagePaymentConfig
+ * @return
+ */
+ @PostMapping("/course/getCoursePackagePaymentConfig")
+ public CoursePackagePaymentConfig getCoursePackagePaymentConfig(@RequestBody GetCoursePackagePaymentConfig getCoursePackagePaymentConfig){
+ CoursePackagePaymentConfig coursePackagePaymentConfig = coursePackagePaymentConfigService.getOne(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", getCoursePackagePaymentConfig.getCoursePackageId())
+ .eq("classHours", getCoursePackagePaymentConfig.getClassHours())
+ );
+ return coursePackagePaymentConfig;
+ }
}
--
Gitblit v1.7.1