admin1/jiangchengfeiyi-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善了用户登录

Browse Source
This commit is contained in:
chen-xin-zhi 2024-11-04 19:21:17 +08:00
parent 111a482cbd
commit d7f499378d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/cultural/heritage/service/order/impl/OrderServiceImpl.java
View File

@ -37,13 +37,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
Date endTime = orderQueryRequest.getEndTime(); Date endTime = orderQueryRequest.getEndTime();
String sortOrder = orderQueryRequest.getSortOrder(); String sortOrder = orderQueryRequest.getSortOrder();
String sortField = orderQueryRequest.getSortField(); String sortField = orderQueryRequest.getSortField();
QueryWrapper<Order> queryWrapper = new QueryWrapper<>(); QueryWrapper<Order> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ObjectUtils.isNotEmpty(userId), "userId", userId); queryWrapper.eq(ObjectUtils.isNotEmpty(userId), "userId", userId);
queryWrapper.ge(ObjectUtils.isNotEmpty(minTotalAmount), "totalAmount", minTotalAmount); queryWrapper.ge(ObjectUtils.isNotEmpty(minTotalAmount), "totalAmount", minTotalAmount);
queryWrapper.le(ObjectUtils.isNotEmpty(maxTotalAmount), "totalAmount", maxTotalAmount); queryWrapper.le(ObjectUtils.isNotEmpty(maxTotalAmount), "totalAmount", maxTotalAmount);
queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus); queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus);
queryWrapper.between("createTime", startTime, endTime); queryWrapper.between(startTime != null && endTime != null, "createTime", startTime, endTime);
queryWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber); queryWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber);
queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC), queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
sortField); sortField);