From f4c4e5b443535ddf33cf0d2fd7e1151b12e63ae5 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Mon, 24 Mar 2025 19:55:27 +0800
Subject: [PATCH] this is 3.24 update

---
 .../order/impl/ClothesRentOrderServiceImpl.java      |  6 ++++++
 src/main/resources/application.yml                   | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java b/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java
index 9ef6cad..12a985c 100644
--- a/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java
+++ b/src/main/java/com/cultural/heritage/service/order/impl/ClothesRentOrderServiceImpl.java
@@ -3,6 +3,7 @@ package com.cultural.heritage.service.order.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cultural.heritage.common.ErrorCode;
+import com.cultural.heritage.constant.CommonConstant;
 import com.cultural.heritage.constant.MqConstant;
 import com.cultural.heritage.exception.ThrowUtils;
 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.service.order.ClothesRentOrderService;
 import com.cultural.heritage.utils.MultiDelayMessage;
+import com.cultural.heritage.utils.SqlUtils;
 import com.cultural.heritage.utils.TimeSplitterUtils;
 import jakarta.annotation.Resource;
 import org.apache.commons.lang3.ObjectUtils;
@@ -39,12 +41,16 @@ public class ClothesRentOrderServiceImpl extends ServiceImpl<ClothesRentOrderMap
         String orderStatus = clothesRentOrderQueryRequest.getOrderStatus();
         String name = clothesRentOrderQueryRequest.getName();
         String phone = clothesRentOrderQueryRequest.getPhone();
+        String sortField = clothesRentOrderQueryRequest.getSortField();
+        String sortOrder = clothesRentOrderQueryRequest.getSortOrder();
         QueryWrapper<ClothesRentOrder> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ObjectUtils.isNotEmpty(id), "id", id);
         queryWrapper.eq(StringUtils.isNotBlank(orderNumber), "orderNumber", orderNumber);
         queryWrapper.eq(StringUtils.isNotBlank(orderStatus), "orderStatus", orderStatus);
         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.orderBy(SqlUtils.validSortField(sortField), sortOrder.equals(CommonConstant.SORT_ORDER_ASC),
+                sortField);
         return queryWrapper;
     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index c8a9dd1..83cbd6c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -75,12 +75,12 @@ springdoc:
 
 
 server:
-  port: 9092
-#  port: 8888
-#  ssl:
-#    key-store: classpath:carboner.cn.jks
-#    key-store-password: 6gsn1hke4m4f7
-#    key-store-type: JKS
+#  port: 9092
+  port: 8888
+  ssl:
+    key-store: classpath:carboner.cn.jks
+    key-store-password: 6gsn1hke4m4f7
+    key-store-type: JKS
 
   servlet:
     context-path: /api