From 138ddc13bb19c0e634b590aa9bd3c9ac3f2194b9 Mon Sep 17 00:00:00 2001
From: sonjinyon <2476687577@qq.com>
Date: Thu, 17 Oct 2024 11:22:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86=E5=95=86?=
 =?UTF-8?q?=E5=9F=8E=E8=AE=A2=E5=8D=95=E8=AE=B0=E5=BD=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/mall/promotion/point/activity/PointActivityForm.vue   | 2 +-
 .../yudao/module/trade/dal/mysql/order/TradeOrderMapper.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue b/yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue
index a09565c..48c49a8 100644
--- a/yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue
+++ b/yudao-admin-vue3/src/views/mall/promotion/point/activity/PointActivityForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle" width="65%">
+  <Dialog v-model="dialogVisible" :title="dialogTitle" width="95%">
     <Form
       ref="formRef"
       v-loading="formLoading"
diff --git a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
index b5f48ed..e714837 100644
--- a/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
+++ b/yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/mysql/order/TradeOrderMapper.java
@@ -136,6 +136,6 @@ public interface TradeOrderMapper extends BaseMapperX<TradeOrderDO> {
             " inner join trade_order_item b on a.id = b.order_id " +
             " inner join (SELECT sort, label, value, dict_type, css_class FROM system_dict_data WHERE dict_type = 'trade_order_status') d on d.sort = a.status "+
             " inner join product_spu c on b.spu_id = c.id " +
-            " where a.user_id = #{userId} and a.use_point > 0 ")
+            " where a.user_id = #{userId} and a.use_point > 0 order by a.create_time ASC ")
     List<AppPointOrderVO> getPointOrder(Long userId);
 }