From 3818974122e7b80e0fe04fd5709a853bac831caa Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 12 十一月 2024 20:18:01 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 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 a98f39c..5d898f2 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
@@ -172,8 +172,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);
@@ -185,10 +185,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 (StringUtils.hasLength(courseDTO.getIds())){
courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
@@ -215,7 +215,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());
@@ -313,7 +313,7 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
case 4:
@@ -418,7 +418,7 @@
}
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());
@@ -461,10 +461,7 @@
}
List<Order> page = orderService.list(courseLambdaQueryWrapper);
- Page<Order> objectPage = new Page<>();
- objectPage.setTotal(page.size());
- objectPage.setCurrent(courseDTO.getPageCurr());
- objectPage.setSize(courseDTO.getPageSize());
+
List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
for (AppUserWithdraw appUserWithdraw : data2) {
Order order = new Order();
@@ -483,6 +480,10 @@
order.setCreateTime(appUserWithdraw.getCreateTime());
page.add(order);
}
+ Page<Order> objectPage = new Page<>();
+ objectPage.setTotal(page.size());
+ objectPage.setCurrent(courseDTO.getPageCurr());
+ objectPage.setSize(courseDTO.getPageSize());
for (Order record : page) {
record.setUid(record.getId().toString());
record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
@@ -519,8 +520,8 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
- record.setGeneralPriceVip(record.getRealPayAmount());
+ record.setBuyContent(record.getBuyContent());
+ record.setGeneralPriceVip(record.getTotalAmount());
break;
case 4:
record.setBuyContent("充值");
@@ -570,8 +571,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);
@@ -583,12 +584,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:
@@ -604,13 +607,16 @@
courseLambdaQueryWrapper.in(Order::getPayType,payType4);
break;
}
-
}
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (courseDTO.getPaymentStatus()!=null){
+ courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
+ }
+ if (courseDTO.getOrderFrom()!=null){
+ courseLambdaQueryWrapper.eq(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());
@@ -642,6 +648,7 @@
}
courseLambdaQueryWrapper.in(Order::getId,collect);
}
+
courseLambdaQueryWrapper.orderByDesc(Order::getCreateTime);
if (org.springframework.util.StringUtils.hasLength(courseDTO.getUserNameOrPhone())){
List<Long> collect = remoteAppUserService.getAppUserByNameOrPhone(courseDTO.getUserNameOrPhone()).getData();
@@ -650,6 +657,7 @@
}
courseLambdaQueryWrapper.in(Order::getAppUserId, collect);
}
+
List<Order> page = orderService.list(courseLambdaQueryWrapper);
List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
for (AppUserWithdraw appUserWithdraw : data2) {
@@ -707,8 +715,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);
@@ -720,10 +728,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 (StringUtils.hasLength(courseDTO.getIds())){
courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
@@ -754,7 +762,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());
@@ -830,7 +838,7 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
}
--
Gitblit v1.7.1