From fd88d7b527e99bbf7272d28bf0826b05e3c175d8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 16 十二月 2024 17:10:53 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 225 ++++++++++++++++++++++++++++----------------------------
1 files changed, 113 insertions(+), 112 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..3905395 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
@@ -159,7 +159,9 @@
if (status!=0){
orderLambdaQueryWrapper.eq(Order::getPaymentStatus, status);
}
- orderLambdaQueryWrapper.eq(Order::getPaymentStatus, 2);
+ if (status!=0){
+ orderLambdaQueryWrapper.eq(Order::getPaymentStatus, status);
+ }
orderLambdaQueryWrapper.in(Order::getOrderFrom,longs);
orderLambdaQueryWrapper.ne(Order::getRefundStatus, 3);
List<Order> list = orderService.list(orderLambdaQueryWrapper);
@@ -172,8 +174,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);
@@ -184,38 +186,23 @@
List<Integer> payType3 = new ArrayList<>();
payType3.add(3);
payType3.add(7);
- List<Integer> payType4 = new ArrayList<>();
- payType3.add(4);
- payType3.add(5);
- payType3.add(6);
- payType3.add(7);
+
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
- if (StringUtils.hasLength(courseDTO.getIds())){
- courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
+ if (startTime!=null){
+ courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
+ courseLambdaQueryWrapper.eq(Order::getPayType, courseDTO.getPayType());
}
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
- courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
+ 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());
@@ -258,8 +245,8 @@
}
List<Order> page = orderService.list(courseLambdaQueryWrapper);
+
List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
- List<WaterExport> waterExports = new ArrayList<>();
for (AppUserWithdraw appUserWithdraw : data2) {
Order order = new Order();
order.setId(appUserWithdraw.getId());
@@ -277,6 +264,58 @@
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()));
+ AppUser byId1 = remoteAppUserService.getAppUserById(record.getAppUserId()+"").getData();
+ if (Objects.nonNull(byId1)){
+ record.setUserName(byId1.getNickname());
+ record.setCellPhone(byId1.getCellPhone());
+ }
+ if (record.getOrderFrom()!=null){
+ switch (record.getOrderFrom()){
+ case 1:
+ Meditation data = remoteMeditationService.getMeditationById(record.getBusinessId()).getData();
+ if (data!=null){
+ record.setCategoryMeditationName(data.getCategoryName());
+ record.setMeditationTitle(data.getMeditationTitle());
+ record.setIconUrl(data.getCoverUrl());
+ record.setDetailDescription(data.getDetailDescription());
+ record.setGeneralPriceMeditation(data.getGeneralPrice());
+ record.setListingStatusMeditation(data.getListingStatus());
+ record.setMeditationUid(data.getId()+"");
+ }
+ break;
+ case 2:
+ Course data1 = remoteCourseService.getCourseById(record.getBusinessId()).getData();
+ if (data1!=null){
+ record.setCategoryCourseName(data1.getCategoryName());
+ record.setCourseTitle(data1.getCourseTitle());
+ record.setCoverUrl(data1.getCoverUrl());
+ record.setTutor(data1.getTutor());
+ record.setCourseChapterCount(data1.getCourseChapterCount());
+ record.setGeneralPriceCourse(data1.getGeneralPrice());
+ record.setListingStatusCourse(data1.getListingStatus());
+ record.setCourseUid(data1.getId()+"");
+ }
+ break;
+ case 3:
+ record.setBuyContent(record.getBuyContent());
+ record.setGeneralPriceVip(record.getTotalAmount());
+ break;
+ case 4:
+ record.setBuyContent("充值");
+ record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
+ .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
+ break;
+ }
+ }
+ }
+ List<WaterExport> waterExports = new ArrayList<>();
for (Order record : page) {
record.setUid(record.getId().toString());
record.setPlatformMoney(record.getRealPayAmount().subtract(record.getCommissionAmount()==null?BigDecimal.ZERO:record.getCommissionAmount()));
@@ -313,13 +352,13 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
case 4:
record.setBuyContent("余额充值");
- record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
- .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
+ record.setPlatformMoney((record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount())
+ .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO));
break;
}
}
@@ -332,7 +371,7 @@
waterExport.setCellphone(byId1.getCellPhone());
}
waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
- waterExport.setCommissionAmount("￥"+record.getCommissionAmount());
+ waterExport.setCommissionAmount("￥"+(record.getCommissionAmount()==null?new BigDecimal("0")+"":record.getCommissionAmount()+""));
waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
waterExport.setBuyContent(record.getBuyContent());
waterExport.setOrderFrom(record.getOrderFrom()+"");
@@ -341,6 +380,7 @@
String format = df.format(record.getCreateTime());
waterExport.setCreateTime(format);
waterExport.setPaymentStatus(record.getPaymentStatus()+"");
+ waterExports.add(waterExport);
}
Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WaterExport.class, waterExports);
@@ -385,30 +425,13 @@
List<Integer> payType3 = new ArrayList<>();
payType3.add(3);
payType3.add(7);
- List<Integer> payType4 = new ArrayList<>();
- 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);
}
if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
+ courseLambdaQueryWrapper.eq(Order::getPayType, courseDTO.getPayType());
}
if (courseDTO.getPaymentStatus()!=null){
courseLambdaQueryWrapper.eq(Order::getPaymentStatus, courseDTO.getPaymentStatus());
@@ -418,7 +441,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 +484,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,9 +503,13 @@
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()));
+ 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());
@@ -519,13 +543,12 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
- record.setGeneralPriceVip(record.getRealPayAmount());
+ record.setBuyContent(record.getBuyContent());
+ record.setGeneralPriceVip(record.getTotalAmount());
break;
case 4:
record.setBuyContent("充值");
- record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
- .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
+
break;
}
}
@@ -570,47 +593,25 @@
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);
- payType1.add(5);
- List<Integer> payType2 = new ArrayList<>();
- payType2.add(2);
- payType2.add(6);
- List<Integer> payType3 = new ArrayList<>();
- payType3.add(3);
- payType3.add(7);
- List<Integer> payType4 = new ArrayList<>();
- payType3.add(4);
- payType3.add(5);
- payType3.add(6);
- payType3.add(7);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
- courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
- if (courseDTO.getPayType()!=null){
- switch (courseDTO.getPayType()){
- case 1:
- courseLambdaQueryWrapper.in(Order::getPayType,payType1);
- break;
- case 2:
- courseLambdaQueryWrapper.in(Order::getPayType,payType2);
- break;
- case 3:
- courseLambdaQueryWrapper.in(Order::getPayType,payType3);
- break;
- case 4:
- courseLambdaQueryWrapper.in(Order::getPayType,payType4);
- break;
- }
-
+ if (startTime!=null){
+ courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
}
- courseLambdaQueryWrapper.eq(courseDTO.getPaymentStatus()!=null,Order::getPaymentStatus, courseDTO.getPaymentStatus());
- courseLambdaQueryWrapper.eq(courseDTO.getOrderFrom()!=null,Order::getOrderFrom, courseDTO.getOrderFrom());
+ if (courseDTO.getPayType()!=null){
+ courseLambdaQueryWrapper.eq(Order::getPayType,courseDTO.getPayType());
+ }
+ 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 +643,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 +652,7 @@
}
courseLambdaQueryWrapper.in(Order::getAppUserId, collect);
}
+
List<Order> page = orderService.list(courseLambdaQueryWrapper);
List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
for (AppUserWithdraw appUserWithdraw : data2) {
@@ -687,9 +690,7 @@
break;
}
}
- if (record.getRealPayAmount()!=null&& record.getRefundStatus()!=null && record.getRefundStatus()!=3){
- totalMoney = totalMoney.add(record.getRealPayAmount());
- }
+ totalMoney = totalMoney.add(record.getTotalAmount());
}
orderCountVO.setTotalCount(page.size());
orderCountVO.setPayCount(payCount);
@@ -707,8 +708,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 +721,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 +755,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 +831,7 @@
}
break;
case 3:
- record.setBuyContent(record.getVipType());
+ record.setBuyContent(record.getBuyContent());
record.setGeneralPriceVip(record.getRealPayAmount());
break;
}
@@ -988,6 +989,7 @@
if (data!=null){
record.setCategoryMeditationName(data.getCategoryName());
record.setMeditationTitle(data.getMeditationTitle());
+ record.setCoverUrl(data.getCoverUrl());
record.setIconUrl(StringUtils.hasLength(data.getCoverUrl())?data.getCoverUrl().split(",")[0]:"");
record.setDetailDescription(data.getDetailDescription());
record.setGeneralPriceMeditation(record.getRealPayAmount());
@@ -1019,7 +1021,6 @@
}
@PostMapping("/orderCount")
@ApiOperation(value = "订单列表管理列表上方合计数据", tags = {"管理后台-订单列表管理"})
-
public R<OrderCountVO> orderCount(@RequestBody OrderListDTO courseDTO) {
OrderCountVO orderCountVO = new OrderCountVO();
String startTime = null;
@@ -1128,7 +1129,7 @@
break;
}
}
- if (record.getRealPayAmount()!=null && record.getRefundStatus()!=3){
+ if (record.getRealPayAmount()!=null){
totalMoney = totalMoney.add(record.getRealPayAmount());
}
}
--
Gitblit v1.7.1