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

this is 3.24 update

Browse Source
This commit is contained in:
chen-xin-zhi 2025-03-24 19:55:27 +08:00
parent 1652a7ba00
commit f4c4e5b443
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.cultural.heritage.service.order.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.cultural.heritage.common.ErrorCode; import com.cultural.heritage.common.ErrorCode;
import com.cultural.heritage.constant.CommonConstant;
import com.cultural.heritage.constant.MqConstant; import com.cultural.heritage.constant.MqConstant;
import com.cultural.heritage.exception.ThrowUtils; import com.cultural.heritage.exception.ThrowUtils;
import com.cultural.heritage.mapper.ClothesRentOrderMapper; import com.cultural.heritage.mapper.ClothesRentOrderMapper;
@ -11,6 +12,7 @@ import com.cultural.heritage.model.dto.clothesRentOrder.ClothesRentOrderQueryReq
import com.cultural.heritage.model.entity.ClothesRentOrder; import com.cultural.heritage.model.entity.ClothesRentOrder;
import com.cultural.heritage.service.order.ClothesRentOrderService; import com.cultural.heritage.service.order.ClothesRentOrderService;
import com.cultural.heritage.utils.MultiDelayMessage; import com.cultural.heritage.utils.MultiDelayMessage;
import com.cultural.heritage.utils.SqlUtils;
import com.cultural.heritage.utils.TimeSplitterUtils; import com.cultural.heritage.utils.TimeSplitterUtils;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
@ -39,12 +41,16 @@ public class ClothesRentOrderServiceImpl extends ServiceImpl<ClothesRentOrderMap
String orderStatus = clothesRentOrderQueryRequest.getOrderStatus(); String orderStatus = clothesRentOrderQueryRequest.getOrderStatus();
String name = clothesRentOrderQueryRequest.getName(); String name = clothesRentOrderQueryRequest.getName();
String phone = clothesRentOrderQueryRequest.getPhone(); String phone = clothesRentOrderQueryRequest.getPhone();
String sortField = clothesRentOrderQueryRequest.getSortField();
String sortOrder = clothesRentOrderQueryRequest.getSortOrder();
QueryWrapper<ClothesRentOrder> queryWrapper = new QueryWrapper<>(); QueryWrapper<ClothesRentOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id); queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
queryWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber); queryWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber);
queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus); queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus);
queryWrapper.like(StringUtils.isNotBlank(name), "JSON_UNQUOTE(JSON_EXTRACT(contactsSnapshot, '$.name'))", name); queryWrapper.like(StringUtils.isNotBlank(name), "JSON_UNQUOTE(JSON_EXTRACT(contactsSnapshot, '$.name'))", name);
queryWrapper.eq(StringUtils.isNotBlank(phone), "JSON_UNQUOTE(JSON_EXTRACT(contactsSnapshot, '$.phone'))", phone); queryWrapper.eq(StringUtils.isNotBlank(phone), "JSON_UNQUOTE(JSON_EXTRACT(contactsSnapshot, '$.phone'))", phone);
queryWrapper.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
sortField);
return queryWrapper; return queryWrapper;
} }

12
src/main/resources/application.yml
View File

@ -75,12 +75,12 @@ springdoc:
server: server:
port: 9092 # port: 9092
# port: 8888 port: 8888
# ssl: ssl:
# key-store: classpath:carboner.cn.jks key-store: classpath:carboner.cn.jks
# key-store-password: 6gsn1hke4m4f7 key-store-password: 6gsn1hke4m4f7
# key-store-type: JKS key-store-type: JKS
servlet: servlet:
context-path: /api context-path: /api