From 3ec572e2cb7adf7d33d2018b24c003d9ef18906a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 13:32:51 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 4677585..a98f39c 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
@@ -373,8 +373,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);
@@ -386,10 +386,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);
@@ -485,7 +485,7 @@
}
for (Order record : page) {
record.setUid(record.getId().toString());
- record.setPlatformMoney(record.getRealPayAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
+ record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData();
if (Objects.nonNull(byId1)){
record.setUserName(byId1.getNickname());
@@ -1151,7 +1151,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());
--
Gitblit v1.7.1