From c0f6294b0be6789fddd652f89f820fcf6d5526cf Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 06 七月 2023 17:32:39 +0800
Subject: [PATCH] 合并代码
---
cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 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 e07e2be..3194c85 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
@@ -3,12 +3,18 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.course.entity.TCoursePackage;
+import com.dsh.course.entity.TCoursePackageDiscount;
import com.dsh.course.entity.TCoursePackagePayment;
import com.dsh.course.feignclient.model.*;
+import com.dsh.course.model.dto.DiscountJsonDto;
+import com.dsh.course.service.PostCourseVideoService;
+import com.dsh.course.service.TCoursePackageDiscountService;
import com.dsh.course.service.TCoursePackagePaymentService;
import com.dsh.course.service.TCoursePackageService;
import com.dsh.course.util.DateUtil;
import com.dsh.course.util.StrUtils;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.annotations.Api;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -36,6 +42,12 @@
@Autowired
private TCoursePackageService tcpService;
+
+ @Autowired
+ private TCoursePackageDiscountService tcpdService;
+
+ @Autowired
+ private PostCourseVideoService pcvService;
private final SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
@@ -208,27 +220,54 @@
}
courseVo.setCourseTime(coursePackage.getClassStartTime()+"-"+coursePackage.getClassEndTime());
- // TODO: 2023/6/30 查询会员折扣数据
String payType = tCoursePackagePayment.getPayType();
BigDecimal cashPayment = tCoursePackagePayment.getCashPayment();
double cashPaymentValue = cashPayment.doubleValue();
Integer playPaiCoin = tCoursePackagePayment.getPlayPaiCoin();
+ TCoursePackageDiscount coursePackageDiscount = tcpdService.getOne(new QueryWrapper<TCoursePackageDiscount>()
+ .eq("coursePackageId",coursePackage.getId() )
+ .eq("type",1)
+ .eq("auditStatus",2));
+ ObjectMapper objectMapper = new ObjectMapper();
+ String content = coursePackageDiscount.getContent();
+ double discountMember = 0.0;
+ DiscountJsonDto discountJsonDto = null;
+ try {
+ discountJsonDto = objectMapper.readValue(content, DiscountJsonDto.class);
+ discountMember = discountJsonDto.getDiscountMember();
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
switch (payType) {
case "1;2":
courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
courseVo.setWpGold(playPaiCoin);
break;
case "1":
courseVo.setAmount(cashPaymentValue);
+ courseVo.setVipAmount(discountMember);
break;
case "2":
courseVo.setWpGold(playPaiCoin);
break;
}
-
courseVo.setStoreId(coursePackage.getStoreId());
}
return courseVo;
}
+
+
+ @PostMapping("/base/coursePack/afterCourseTwos")
+ public List<AfterVideoVo> getAfterCourseTwos(@RequestParam("appUserId") Integer appUserId){
+ List<AfterVideoVo> videoVos = new ArrayList<>();
+ List<TCoursePackagePayment> tCoursePackagePayments = packagePaymentService.queryAllCoursePackage(null,null,null,null,appUserId);
+ List<Integer> coursePackageIds = tCoursePackagePayments.stream().map(TCoursePackagePayment::getCoursePackageId).collect(Collectors.toList());
+// List<PostCourseVideo> videoList = pcvService.queryAllVideoNoneShow(coursePackageIds);
+ return videoVos;
+ }
+
+
+
}
--
Gitblit v1.7.1