From 50584ff739dc50dd3a1ed0813b8a2991814d3da4 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 10 Jan 2024 10:18:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=B5=A0=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml     | 2 +-
 .../java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java   | 2 +-
 .../java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml
index 61dd013..6fd4c8b 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftMapper.xml
@@ -201,7 +201,7 @@
             gi.*,gi.isShare as share
         FROM  emp_card_gift gi
         where gi.empCardSid=#{empCardSid}
-
+        order by createTime desc
     </select>
     <select id="getEmpCardGiftByGiftbagSid" resultType="com.yxt.yyth.api.empcardgift.EmpCardGiftVo">
         SELECT
diff --git a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
index c9e7b5b..1f76c91 100644
--- a/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
+++ b/src/main/java/com/yxt/yyth/biz/empcardgift/EmpCardGiftService.java
@@ -298,7 +298,7 @@ public class EmpCardGiftService extends MybatisBaseService<EmpCardGiftMapper, Em
                 vo.setValue(vo2.getSid());
             }
         }
-        List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2"));
+        List<EmpCardGift> empCardGift =baseMapper.selectList(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","2").orderByDesc("createTime"));
         empCardGift.forEach(s->{
             List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
             list1.forEach(l->{
diff --git a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
index 0e969de..38168f3 100644
--- a/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
+++ b/src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java
@@ -348,7 +348,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                 vo.setValue(vo2.getSid());
             }
         }
-        List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3"));
+        List<EmpCardGift> empCardGift =empCardGiftService.list(new QueryWrapper<EmpCardGift>().eq("empCardSid",vo.getSid()).eq("cardType","3").orderByDesc("createTime"));
         empCardGift.forEach(s->{
             List<EmpCardGiftGoods> list1= empCardGiftGoodsService.list(new QueryWrapper<EmpCardGiftGoods>().eq("empCardGiftSid",s.getSid()));
             list1.forEach(l->{