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 | 499 +++++++++++++++++++++++++++----------------------------
1 files changed, 246 insertions(+), 253 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 5d898f2..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);
@@ -184,231 +186,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 (StringUtils.hasLength(courseDTO.getIds())){
- courseLambdaQueryWrapper.in(Order::getId, Arrays.asList(courseDTO.getIds().split(",")));
- }
- 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(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 (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
- // 查询购买内容
- 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());
- List<Long> data = remoteCourseService.getCourseIdsByName(courseDTO.getBuyContent()).getData();
- if (!data.isEmpty()){
- List<Long> collect3 = orderService.lambdaQuery().in(Order::getBusinessId, data)
- .eq(Order::getOrderFrom, 2)
- .list().stream()
- .map(Order::getId).collect(Collectors.toList());
- if (!collect3.isEmpty()){
- collect1.addAll(collect3);
- }
- }
- List<Long> data1 = remoteMeditationService.getMeditationIdsByName(courseDTO.getBuyContent()).getData();
- if (!data1.isEmpty()){
- List<Long> collect3 = orderService.lambdaQuery().in(Order::getBusinessId, data1)
- .eq(Order::getOrderFrom, 1)
- .list().stream()
- .map(Order::getId).collect(Collectors.toList());
- if (!collect3.isEmpty()){
- collect1.addAll(collect3);
- }
- }
- collect1.addAll(collect2);
- List<Long> collect = collect1.stream().distinct().collect(Collectors.toList());
- if (collect.isEmpty()){
- collect.add(-1L);
- }
- 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();
- if (collect.isEmpty()){
- collect.add(-1L);
- }
- courseLambdaQueryWrapper.in(Order::getAppUserId, collect);
- }
-
- 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());
- order.setBizOrderNo(appUserWithdraw.getCode());
- order.setUid(appUserWithdraw.getId()+"");
- order.setBuyContent("提现");
- order.setAppUserId(appUserWithdraw.getAppUserId());
- order.setOrderFrom(5);
- order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
- order.setPayType(4);
- order.setTotalAmount(appUserWithdraw.getAmount());
- order.setRealPayAmount(appUserWithdraw.getAmount());
- order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
- order.setPaymentTime(appUserWithdraw.getWithdrawTime());
- order.setCreateTime(appUserWithdraw.getCreateTime());
- page.add(order);
- }
- for (Order record : page) {
- record.setUid(record.getId().toString());
- record.setPlatformMoney(record.getRealPayAmount().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.getIconUrl());
- 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.getRealPayAmount());
- break;
- case 4:
- record.setBuyContent("余额充值");
- record.setPlatformMoney(record.getRealPayAmount()!=null?record.getRealPayAmount()
- .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO):BigDecimal.ZERO);
- break;
- }
- }
- WaterExport waterExport = new WaterExport();
- waterExport.setCode(record.getBizOrderNo());
- if (Objects.nonNull(byId1)){
- record.setUserName(byId1.getNickname());
- record.setCellPhone(byId1.getCellPhone());
- waterExport.setUserName(byId1.getNickname());
- waterExport.setCellphone(byId1.getCellPhone());
- }
- waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
- waterExport.setCommissionAmount("￥"+record.getCommissionAmount());
- waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
- waterExport.setBuyContent(record.getBuyContent());
- waterExport.setOrderFrom(record.getOrderFrom()+"");
- waterExport.setPayType(record.getPayType());
- DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- String format = df.format(record.getCreateTime());
- waterExport.setCreateTime(format);
- waterExport.setPaymentStatus(record.getPaymentStatus()+"");
- }
-
- Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WaterExport.class, waterExports);
- HttpServletResponse response = WebUtils.response();
- response.setContentType("application/vnd.ms-excel");
- response.setCharacterEncoding("utf-8");
- ServletOutputStream outputStream = null;
- try {
- String fileName = URLEncoder.encode("收支流水导出.xls", "utf-8");
- response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
- response.setContentType("application/vnd.ms-excel;charset=UTF-8");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache");
- outputStream = response.getOutputStream();
- workbook.write(outputStream);
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- try {
- outputStream.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
- @PostMapping("/waterList")
- @ApiOperation(value = "收支流水-分页", tags = {"管理后台-财务管理"})
- public R<Page<Order>> waterList(@RequestBody OrderListDTO courseDTO) {
- String startTime = null;
- 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";
- }
- 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<>();
- 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());
@@ -531,6 +315,244 @@
}
}
}
+ 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()));
+ 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.getIconUrl());
+ 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.getRealPayAmount());
+ break;
+ case 4:
+ record.setBuyContent("余额充值");
+ record.setPlatformMoney((record.getRealPayAmount()!=null?record.getRealPayAmount():record.getTotalAmount())
+ .subtract(record.getCommissionAmount()!=null?record.getCommissionAmount():BigDecimal.ZERO));
+ break;
+ }
+ }
+ WaterExport waterExport = new WaterExport();
+ waterExport.setCode(record.getBizOrderNo());
+ if (Objects.nonNull(byId1)){
+ record.setUserName(byId1.getNickname());
+ record.setCellPhone(byId1.getCellPhone());
+ waterExport.setUserName(byId1.getNickname());
+ waterExport.setCellphone(byId1.getCellPhone());
+ }
+ waterExport.setRealPayAmount("￥"+record.getRealPayAmount());
+ waterExport.setCommissionAmount("￥"+(record.getCommissionAmount()==null?new BigDecimal("0")+"":record.getCommissionAmount()+""));
+ waterExport.setPlatformMoney("￥"+record.getPlatformMoney());
+ waterExport.setBuyContent(record.getBuyContent());
+ waterExport.setOrderFrom(record.getOrderFrom()+"");
+ waterExport.setPayType(record.getPayType());
+ DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ 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);
+ HttpServletResponse response = WebUtils.response();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("收支流水导出.xls", "utf-8");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ response.setContentType("application/vnd.ms-excel;charset=UTF-8");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache");
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ try {
+ outputStream.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ @PostMapping("/waterList")
+ @ApiOperation(value = "收支流水-分页", tags = {"管理后台-财务管理"})
+ public R<Page<Order>> waterList(@RequestBody OrderListDTO courseDTO) {
+ String startTime = null;
+ 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";
+ }
+ 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);
+
+ LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if (startTime!=null){
+ courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
+ }
+ 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::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());
+ List<Long> data = remoteCourseService.getCourseIdsByName(courseDTO.getBuyContent()).getData();
+ if (!data.isEmpty()){
+ List<Long> collect3 = orderService.lambdaQuery().in(Order::getBusinessId, data)
+ .eq(Order::getOrderFrom, 2)
+ .list().stream()
+ .map(Order::getId).collect(Collectors.toList());
+ if (!collect3.isEmpty()){
+ collect1.addAll(collect3);
+ }
+ }
+ List<Long> data1 = remoteMeditationService.getMeditationIdsByName(courseDTO.getBuyContent()).getData();
+ if (!data1.isEmpty()){
+ List<Long> collect3 = orderService.lambdaQuery().in(Order::getBusinessId, data1)
+ .eq(Order::getOrderFrom, 1)
+ .list().stream()
+ .map(Order::getId).collect(Collectors.toList());
+ if (!collect3.isEmpty()){
+ collect1.addAll(collect3);
+ }
+ }
+
+ collect1.addAll(collect2);
+ List<Long> collect = collect1.stream().distinct().collect(Collectors.toList());
+ if (collect.isEmpty()){
+ collect.add(-1L);
+ }
+ 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();
+ if (collect.isEmpty()){
+ collect.add(-1L);
+ }
+ courseLambdaQueryWrapper.in(Order::getAppUserId, collect);
+ }
+
+ List<Order> page = orderService.list(courseLambdaQueryWrapper);
+
+ List<AppUserWithdraw> data2 = remoteAppUserService.getWithdraw(courseDTO).getData();
+ for (AppUserWithdraw appUserWithdraw : data2) {
+ Order order = new Order();
+ order.setId(appUserWithdraw.getId());
+ order.setBizOrderNo(appUserWithdraw.getCode());
+ order.setUid(appUserWithdraw.getId()+"");
+ order.setBuyContent("提现");
+ order.setAppUserId(appUserWithdraw.getAppUserId());
+ order.setOrderFrom(5);
+ order.setPaymentStatus(appUserWithdraw.getWithdrawStatus()+1);
+ order.setPayType(4);
+ order.setTotalAmount(appUserWithdraw.getAmount());
+ order.setRealPayAmount(appUserWithdraw.getAmount());
+ order.setPlatformMoney(appUserWithdraw.getAmount().multiply(new BigDecimal("-1")));
+ order.setPaymentTime(appUserWithdraw.getWithdrawTime());
+ 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("充值");
+
+ break;
+ }
+ }
+ }
// 手动分页
List<Order> testing = testing(page.size(), courseDTO.getPageCurr(), courseDTO.getPageSize(), page);
objectPage.setRecords(testing);
@@ -574,39 +596,12 @@
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<>();
- 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());
@@ -695,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);
@@ -996,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());
@@ -1027,7 +1021,6 @@
}
@PostMapping("/orderCount")
@ApiOperation(value = "订单列表管理列表上方合计数据", tags = {"管理后台-订单列表管理"})
-
public R<OrderCountVO> orderCount(@RequestBody OrderListDTO courseDTO) {
OrderCountVO orderCountVO = new OrderCountVO();
String startTime = null;
@@ -1136,7 +1129,7 @@
break;
}
}
- if (record.getRealPayAmount()!=null && record.getRefundStatus()!=3){
+ if (record.getRealPayAmount()!=null){
totalMoney = totalMoney.add(record.getRealPayAmount());
}
}
--
Gitblit v1.7.1