From 111652d23733d04e379c2454c8b39171596a6b50 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 09 十一月 2024 14:28:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 49 ++++++++++++++++++++++++++-----------------------
1 files changed, 26 insertions(+), 23 deletions(-)
diff --git a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
index e5cf4b2..4677585 100644
--- a/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
+++ b/xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java
@@ -150,8 +150,8 @@
}
if (!time.equals("1")){
String[] split = time.split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
if (startTime!=null){
orderLambdaQueryWrapper.between(Order::getCreateTime,startTime,endTime);
@@ -498,7 +498,7 @@
if (data!=null){
record.setCategoryMeditationName(data.getCategoryName());
record.setMeditationTitle(data.getMeditationTitle());
- record.setIconUrl(data.getIconUrl());
+ record.setIconUrl(data.getCoverUrl());
record.setDetailDescription(data.getDetailDescription());
record.setGeneralPriceMeditation(data.getGeneralPrice());
record.setListingStatusMeditation(data.getListingStatus());
@@ -883,8 +883,8 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
String[] split = courseDTO.getTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
List<Integer> payType1 = new ArrayList<>();
payType1.add(1);
@@ -896,10 +896,10 @@
payType3.add(3);
payType3.add(7);
List<Integer> payType4 = new ArrayList<>();
- payType3.add(4);
- payType3.add(5);
- payType3.add(6);
- payType3.add(7);
+ payType4.add(4);
+ payType4.add(5);
+ payType4.add(6);
+ payType4.add(7);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
@@ -927,7 +927,7 @@
courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
- List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
+ List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
.map(Order::getId).collect(Collectors.toList());
List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
.map(Order::getId).collect(Collectors.toList());
@@ -988,9 +988,9 @@
if (data!=null){
record.setCategoryMeditationName(data.getCategoryName());
record.setMeditationTitle(data.getMeditationTitle());
- record.setIconUrl(data.getIconUrl());
+ record.setIconUrl(StringUtils.hasLength(data.getCoverUrl())?data.getCoverUrl().split(",")[0]:"");
record.setDetailDescription(data.getDetailDescription());
- record.setGeneralPriceMeditation(data.getGeneralPrice());
+ record.setGeneralPriceMeditation(record.getRealPayAmount());
record.setListingStatusMeditation(data.getListingStatus());
record.setMeditationUid(data.getId()+"");
}
@@ -1003,13 +1003,13 @@
record.setCoverUrl(data1.getCoverUrl());
record.setTutor(data1.getTutor());
record.setCourseChapterCount(data1.getCourseChapterCount());
- record.setGeneralPriceCourse(data1.getGeneralPrice());
+ record.setGeneralPriceCourse(record.getRealPayAmount());
record.setListingStatusCourse(data1.getListingStatus());
record.setCourseUid(data1.getId()+"");
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
}
@@ -1026,8 +1026,8 @@
String endTime = null;
if (org.springframework.util.StringUtils.hasLength(courseDTO.getTime())){
String[] split = courseDTO.getTime().split(" - ");
- startTime = split[0]+"00:00:00";
- endTime = split[1]+"23:59:59";
+ startTime = split[0]+" 00:00:00";
+ endTime = split[1]+" 23:59:59";
}
List<Integer> payType1 = new ArrayList<>();
payType1.add(1);
@@ -1039,12 +1039,14 @@
payType3.add(3);
payType3.add(7);
List<Integer> payType4 = new ArrayList<>();
- payType3.add(4);
- payType3.add(5);
- payType3.add(6);
- payType3.add(7);
+ payType4.add(4);
+ payType4.add(5);
+ payType4.add(6);
+ payType4.add(7);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
- courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
+ if (startTime!=null){
+ courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
+ }
if (courseDTO.getPayType()!=null){
switch (courseDTO.getPayType()){
case 1:
@@ -1067,7 +1069,7 @@
courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
- List<Long> collect1 = orderService.lambdaQuery().like(Order::getVipType, courseDTO.getBuyContent()).list().stream()
+ List<Long> collect1 = orderService.lambdaQuery().like(Order::getBuyContent, courseDTO.getBuyContent()).list().stream()
.map(Order::getId).collect(Collectors.toList());
List<Long> collect2 = orderService.lambdaQuery().like(Order::getBizOrderNo, courseDTO.getBuyContent()).list().stream()
.map(Order::getId).collect(Collectors.toList());
@@ -1171,10 +1173,11 @@
record.setCourseUid(data1.getId()+"");
record.setType(data1.getCourseType()+"");
record.setUuid(data1.getId()+"");
+ record.setCourseChapterCount(data1.getCourseChapterCount());
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
}
--
Gitblit v1.7.1