From 33aec4def33ecb3e96af93b5c68f9ecdcb7d91d2 Mon Sep 17 00:00:00 2001
From: Owen <595466820@qq.com>
Date: Mon, 24 Feb 2025 17:34:03 +0800
Subject: [PATCH] TENANT_ID

---
 .../framework/tenant/core/context/TenantContextHolder.java  | 3 ++-
 .../haoka/controller/admin/orders/OrdersController.java     | 2 ++
 .../yudao/module/haoka/dal/mysql/orders/OrdersMapper.java   | 4 ++--
 yudao-server/src/main/resources/application-prod.yaml       | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
index 4e7b5e0d53..c00a4cb7c4 100644
--- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
+++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/context/TenantContextHolder.java
@@ -26,7 +26,8 @@ public class TenantContextHolder {
      * @return 租户编号
      */
     public static Long getTenantId() {
-        return TENANT_ID.get();
+        // return TENANT_ID.get();
+        return 162L;
     }
 
     /**
diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java
index 7dfa3c7b8c..d8b235701d 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/orders/OrdersController.java
@@ -1,5 +1,6 @@
 package cn.iocoder.yudao.module.haoka.controller.admin.orders;
 
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import jakarta.annotation.security.PermitAll;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -44,6 +45,7 @@ public class OrdersController {
     @Operation(summary = "创建订单")
     //@PreAuthorize("@ss.hasPermission('haoka:orders:create')")
     public CommonResult<Long> createOrders(@Valid @RequestBody OrdersSaveReqVO createReqVO) {
+        TenantContextHolder.setTenantId(162L);
         return success(ordersService.createOrders(createReqVO));
     }
 
diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
index fda24504ae..ed97061708 100644
--- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
+++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/orders/OrdersMapper.java
@@ -44,7 +44,7 @@ public interface OrdersMapper extends BaseMapperX<OrdersDO> {
                 .likeIfPresent(OrdersDO::getMerchantName, reqVO.getMerchantName())
                 .eqIfPresent(OrdersDO::getFlag, reqVO.getFlag())
                 .betweenIfPresent(OrdersDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(OrdersDO::getId);
+                .orderByDesc(OrdersDO::getCreateTime);
         if(CollectionUtil.isNotEmpty(status)){
             lambdaQueryWrapperX.in(OrdersDO::getStatus, status);
         }
@@ -52,4 +52,4 @@ public interface OrdersMapper extends BaseMapperX<OrdersDO> {
         return selectPage(reqVO, lambdaQueryWrapperX);
     }
 
-}
\ No newline at end of file
+}
diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml
index 0e2c6b54c4..2bedbed032 100644
--- a/yudao-server/src/main/resources/application-prod.yaml
+++ b/yudao-server/src/main/resources/application-prod.yaml
@@ -153,9 +153,9 @@ spring:
       context-path: /admin # 配置 Spring
 
 # 日志文件配置
-#logging:
-#  file:
-#    name: ${user.home}/logs/${spring.application.name}.log # 日志文件名，全路径
+logging:
+  file:
+    path: /logs
   level:
     # 配置自己写的 MyBatis Mapper 打印日志
     cn.iocoder.yudao.module.bpm.dal.mysql: debug