From 946c4153e6a188403b1a7d05df107c6a1c91090a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 08:47:30 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 2 +-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java | 5 ++++-
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java | 11 ++++++-----
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
index 5f38a7d..bdc22ca 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -521,7 +521,10 @@
@GetMapping("/select")
@ApiOperation(value = "用户列表-查询绑定人", tags = {"管理后台"})
public R<AppUser> select(String phone) {
- AppUser byId = appUserService.lambdaQuery().eq(AppUser::getPhone, phone).one();
+ AppUser byId = appUserService.lambdaQuery()
+ .eq(AppUser::getPhone, phone)
+ .eq(AppUser::getDelFlag,0)
+ .one();
if (byId == null) {
return R.fail("搜索失败，手机号错误。");
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
index 4bcd4c1..c88dd4f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserCouponController.java
@@ -22,6 +22,7 @@
import com.ruoyi.other.api.domain.PointSetting;
import com.ruoyi.other.api.feignClient.GoodsClient;
import com.ruoyi.other.api.feignClient.PointSettingClient;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -135,12 +136,12 @@
String phone,
Integer id) {
- Long appUserId = null;
+ List<Long> appUserIds = null;
if (!StringUtils.isEmpty(phone)){
- AppUser appUser1 = appUserService.getOne(new LambdaQueryWrapper<AppUser>()
+ List<AppUser> appUserList = appUserService.list(new LambdaQueryWrapper<AppUser>()
.like(AppUser::getPhone, phone));
- if (appUser1 != null){
- appUserId = appUser1.getId();
+ if (!CollectionUtils.isEmpty(appUserList)){
+ appUserIds = appUserList.stream().map(AppUser::getId).collect(Collectors.toList());
}
}
@@ -148,7 +149,7 @@
.isNull(status!=null&&(status==1||status==3),UserCoupon::getUseTime)
.isNotNull(status!=null&&status==2,UserCoupon::getUseTime)
.eq(UserCoupon::getCouponId, id)
- .eq(appUserId != null,UserCoupon::getAppUserId, appUserId)
+ .in(appUserIds != null,UserCoupon::getAppUserId, appUserIds)
.lt(status!=null&&status==3,UserCoupon::getEndTime, LocalDateTime.now()).page(Page.of(pageNum-1, pageSize));
for (UserCoupon record : page.getRecords()) {
record.setIdStr(record.getId().toString());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 7061bd3..9bd0e61 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -290,7 +290,7 @@
List<Order> orderList = orderService.list(new LambdaQueryWrapper<Order>()
.eq(sysUser.getRoleType() == 2, Order::getShopId, sysUser.getObjectId())
.between(Order::getCreateTime, LocalDateTime.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")), LocalDateTime.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")))
- .orderByDesc(Order::getCreateTime));
+ .orderByAsc(Order::getCreateTime));
Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
--
Gitblit v1.7.1