From b1a6d6d9cffb3b064604248cfeed749f9f536f89 Mon Sep 17 00:00:00 2001
From: pengren <pengren0401@ztmarter.com>
Date: Fri, 26 Apr 2024 18:03:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E5=8F=B7=EF=BC=9AZSSAC-585=20?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=9A=E8=AE=A2=E5=8D=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sf/order/service/impl/OrderInfoServiceImpl.java | 5 +++--
 sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
index 2aa08de..655d09e 100644
--- a/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
+++ b/sf-order/src/main/java/com/sf/order/service/impl/OrderInfoServiceImpl.java
@@ -62,7 +62,8 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
     @Override
     public Long createOrder(OrderCreateDto orderCreateDto) {
         OrderInfo orderInfo = new OrderInfo();
-        orderInfo.setOrderNo(snowflakeIdWorker.nextId());
+        long id = snowflakeIdWorker.nextId();
+        orderInfo.setOrderNo(id);
         orderInfo.setPayType(1L);
         orderInfo.setReceiveType(0L);
         orderInfo.setOrderStatus(0L);
@@ -76,7 +77,7 @@ public class OrderInfoServiceImpl implements IOrderInfoService {
         orderInfo.setOutOrderNo(orderCreateDto.getOutOrderNo());
         orderInfo.setAppCode(orderCreateDto.getAppCode());
         orderInfoMapper.insertOrderInfo(orderInfo);
-        return snowflakeIdWorker.nextId();
+        return id;
     }
 
     /**
diff --git a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
index 13ecb93..3a208c6 100644
--- a/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
+++ b/sf-order/src/main/resources/mapper/order/OrderInfoMapper.xml
@@ -90,8 +90,8 @@
             <if test="orderStatus != null "> and a.order_status = #{orderStatus}</if>
             <if test="userId != null "> and a.create_user_id = #{userId}</if>
         </where>
-    </select>
-
+        ORDER BY a.create_time DESC
+        </select>
     <select id="selectOrderInfoById" parameterType="Long" resultMap="OrderInfoResult">
         <include refid="selectOrderInfoVo"/>
         where id = #{id}