From acad524bfb7f376c09ff8e6600fab207780156e1 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 23 十一月 2023 18:46:05 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-course/src/main/java/com/dsh/course/controller/CourseController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 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 10eb06d..74fc79f 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
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.entity.*;
+import com.dsh.course.entity.dto.SelectDto;
import com.dsh.course.feignclient.model.ExerciseVideo;
import com.dsh.course.model.*;
import com.dsh.course.model.dto.CourseChangeStateDTO;
@@ -58,6 +59,8 @@
@Autowired
private TCoursePackageDiscountService discountService;
+ @Autowired
+ private ICoursePackagePaymentConfigService coursePackagePaymentConfigService;
/**
* 上/下架 1为上架 2为下架 3为删除
@@ -67,7 +70,6 @@
@RequestMapping("/base/course/changeState")
@ResponseBody
public Object changeState(@RequestBody CourseChangeStateDTO dto){
-
return courseService.changeState(dto);
}
@@ -173,7 +175,7 @@
@ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat){
+ public ResultUtil<CoursePackageInfo> queryCourseInfo(Integer id, String lon, String lat,Long payId){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -196,7 +198,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil paymentCourse(PaymentCourseVo paymentCourseVo){
+ public synchronized ResultUtil paymentCourse(PaymentCourseVo paymentCourseVo){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -277,6 +279,7 @@
@PostMapping("/base/course/aliPaymentCourseCallback")
public void aliPaymentCourseCallback(HttpServletRequest request, HttpServletResponse response){
try {
+ System.err.println("=====支付宝回调=======");
Map<String, String> map = payMoneyUtil.alipayCallback(request);
if(null != map){
String code = map.get("out_trade_no");
@@ -288,6 +291,7 @@
for (TCoursePackagePayment coursePackagePayment : list) {
coursePackagePayment.setPayStatus(2);
coursePackagePayment.setOrderNumber(trade_no);
+ coursePackagePayment.setAppUserId(null);
}
coursePackagePaymentService.updateBatchById(list);
}
@@ -449,9 +453,16 @@
return strings;
}
-
+ // 获取课包商品的价格配置
+ @PostMapping("/course/getHoursByPackageId")
+ @ResponseBody
+ public List<CoursePackagePaymentConfig> getHoursByPackageId(@RequestBody Integer coursePackageId1){
+ List<CoursePackagePaymentConfig> coursePackageId = coursePackagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>()
+ .eq("coursePackageId", coursePackageId1));
+ return coursePackageId;
+ }
@PostMapping("/course/getHours")
- public String getHours(@RequestBody Integer coursePackageId1){
+ public List<Integer> getHours(@RequestBody Integer coursePackageId1){
return coursePackageService.getHours(coursePackageId1);
}
@@ -497,8 +508,9 @@
@PostMapping("/course/auditDiscount")
public Boolean auditDiscount( @RequestBody AuditDiscount auditDiscount){
- TCoursePackageDiscount byId = discountService.getById(auditDiscount.getId());
- List<TCoursePackageDiscount> list = discountService.list(new LambdaQueryWrapper<TCoursePackageDiscount>().eq(TCoursePackageDiscount::getCoursePackageId, byId.getCoursePackageId()));
+
+ 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());
@@ -509,11 +521,15 @@
@Autowired
private ICoursePackagePaymentConfigService packagePaymentConfigService;
@PostMapping("/course/times")
- public List<Integer> times( @RequestBody Integer oneId){
+ public List<SelectDto> times(@RequestBody Integer oneId){
List<CoursePackagePaymentConfig> list = packagePaymentConfigService.list(new QueryWrapper<CoursePackagePaymentConfig>().eq("coursePackageId",oneId));
- List<Integer> integerList = new ArrayList<>();
+ List<SelectDto> integerList = new ArrayList<>();
for (CoursePackagePaymentConfig coursePackagePaymentConfig : list) {
- integerList.add(coursePackagePaymentConfig.getClassHours());
+// integerList.add(coursePackagePaymentConfig.getClassHours());
+ SelectDto selectDto = new SelectDto();
+ selectDto.setId(coursePackagePaymentConfig.getId());
+ selectDto.setValue(String.valueOf(coursePackagePaymentConfig.getClassHours()));
+ integerList.add(selectDto);
}
--
Gitblit v1.7.1