From 06a0fc046c3717da1babd8fa64e92b51a6c34c41 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 22 八月 2024 09:43:16 +0800
Subject: [PATCH] 8.22

---
 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
index a499a52..42c336b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/TAppCouponServiceImpl.java
@@ -7,7 +7,7 @@
 import com.ruoyi.account.api.model.TAppUser;
 import com.ruoyi.account.api.model.TAppUserVipDetail;
 import com.ruoyi.account.api.query.ExchangeRecordGoodsQuery;
-import com.ruoyi.account.api.vo.CouponListVOVO;
+import com.ruoyi.other.api.vo.CouponListVOVO;
 import com.ruoyi.account.api.vo.ExchangeRecordVO;
 import com.ruoyi.account.mapper.TAppCouponMapper;
 import com.ruoyi.account.mapper.TAppUserMapper;
@@ -63,6 +63,10 @@
     private ChargingOrderClient chargingOrderClient;
     @Autowired
     private TAppUserVipDetailService tAppUserVipDetailService;
+    @Autowired
+    private TAppUserMapper tAppUserMapper;
+    @Autowired
+    private TokenService tokenService;
 
     @Override
     public PageInfo<ExchangeRecordVO> pagelist(ExchangeRecordGoodsQuery dto) {
@@ -132,13 +136,11 @@
     }
 
 
-    @Autowired
-    private TAppUserMapper tAppUserMapper;
+
     @Override
     public PageInfo<CouponListVOVO> couponList(CouponListDto dto) {
         // todo token获取用户id
-        Long userId = 11L;
-        dto.setUserId(userId);
+        dto.setUserId(tokenService.getLoginUserApplet().getUserId());
         SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         PageInfo<CouponListVOVO> pageInfo = new PageInfo<>(dto.getPageCurr(),dto.getPageSize());
         List<CouponListVOVO> list = this.baseMapper.couponList(pageInfo,dto.getUserId());
@@ -241,8 +243,8 @@
                     break;
             }
         }
-        // 通过集合的money字段 将money从大到小排序
-        data.sort(Comparator.comparing(CouponListVOVO::getMoney).reversed());
+        // 通过集合的money、isUse字段 将money、isUse从大到小排序 将不可用的排在最后
+        data.sort(Comparator.comparing(CouponListVOVO::getMoney).reversed().thenComparing(CouponListVOVO::getIsUse));
         pageInfo.setRecords(data);
         return pageInfo;
     }

--
Gitblit v1.7.1