From b01f752252eaadd1fa31eda6a9ad43146660b721 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 03 四月 2025 23:42:57 +0800
Subject: [PATCH] bug修改
---
xinquan-modules/xinquan-order/src/main/java/com/xinquan/order/controller/management/MgtOrderController.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 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 fba2703..51727ee 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
@@ -10,6 +10,8 @@
import com.xinquan.common.core.utils.page.CollUtils;
import com.xinquan.common.core.utils.page.PageDTO;
import com.xinquan.common.core.web.page.PageInfo;
+import com.xinquan.common.log.annotation.Log;
+import com.xinquan.common.log.enums.BusinessType;
import com.xinquan.common.security.service.TokenService;
import com.xinquan.course.api.domain.Course;
import com.xinquan.course.api.feign.RemoteCourseService;
@@ -905,6 +907,10 @@
startTime = split[0]+" 00:00:00";
endTime = split[1]+" 23:59:59";
}
+ List<Long> longs = new ArrayList<>();
+ longs.add(1L);
+ longs.add(2L);
+ longs.add(3L);
LambdaQueryWrapper<Order> courseLambdaQueryWrapper = new LambdaQueryWrapper<>();
if (startTime!=null){
courseLambdaQueryWrapper.between(Order::getCreateTime, startTime, endTime);
@@ -917,6 +923,8 @@
}
if (StringUtils.hasLength(courseDTO.getOrderFrom())){
courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
+ }else{
+ courseLambdaQueryWrapper.in(Order::getOrderFrom,longs);
}
courseLambdaQueryWrapper.eq(courseDTO.getUid()!=null&&(!courseDTO.getUid().isEmpty()),Order::getAppUserId, courseDTO.getUid());
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
@@ -1041,6 +1049,12 @@
}
if (StringUtils.hasLength(courseDTO.getOrderFrom())){
courseLambdaQueryWrapper.in(Order::getOrderFrom, Arrays.asList(courseDTO.getOrderFrom().split(",")));
+ }else{
+ List<Long> longs = new ArrayList<>();
+ longs.add(1L);
+ longs.add(2L);
+ longs.add(3L);
+ courseLambdaQueryWrapper.in(Order::getOrderFrom,longs);
}
if (org.springframework.util.StringUtils.hasLength(courseDTO.getBuyContent())){
// 查询购买内容
@@ -1284,6 +1298,8 @@
}
@GetMapping("/cancel")
@ApiOperation(value = "取消订单", tags = "管理后台-订单列表管理")
+ @Log(title = "【订单列表管理】取消订单", businessType = BusinessType.UPDATE)
+
public R updateState(String uid) {
Order byId = orderService.getById(uid);
byId.setPaymentStatus(3);
@@ -1307,6 +1323,7 @@
private TokenService tokenService;
@GetMapping("/ChangeMoney")
@ApiOperation(value = "改价", tags = "管理后台-订单列表管理")
+ @Log(title = "【订单列表管理】改价", businessType = BusinessType.UPDATE)
public R ChangeMoney(String uid,String amount) {
Order byId = orderService.getById(uid);
byId.setChangePrice(new BigDecimal(amount));
--
Gitblit v1.7.1